Changes between Version 38 and Version 39 of GitForDarcsUsers

Timestamp:

06/01/11 06:23:28 (2 years ago)

Author:

igloo

Comment:

--

GitForDarcsUsers

@@ -71 +71 @@
 to end up with
 {{{
-o---o---o---o---o---x---x---x---x <-- master
+                   /- master
+o---o---o---o---o---x---x---x---x <-- feature1
+}}}
+To include the patches in master:
+{{{
+git checkout master
+git reset --hard feature1
+}}}
+{{{
+o---o---o---o---o---x---x---x---x <-- {master, feature1}
 }}}