Changes between Version 2 and Version 3 of MergerTips

Timestamp:

Jul 25, 2013, 8:56:05 AM (11 years ago)

Author:

Preston Holmes

Comment:

--

MergerTips

@@ -61 +61 @@
 
 [https://gist.github.com/aaugustin/1170400 djpatch.py] will automatically look for the latest patch attached to a ticket, or failing that, for the latest pull request mentioned in the comment, and apply it to your local checkout.
+
+== Keeping all current upstream branches current locally ==
+
+{{{
+#!/bin/bash
+git fetch upstream && \
+    git co stable/1.6.x && git merge --ff-only upstream/stable/1.6.x && \
+    git co stable/1.5.x && git merge --ff-only upstream/stable/1.5.x && \
+    git co master && git merge --ff-only upstream/master
+}}}