Changes between Version 9 and Version 10 of GitCreateBundle

Timestamp:

Oct 23, 2013, 2:20:33 PM (11 years ago)

Author:

Piero Campalani

Comment:

Add —no-ff

GitCreateBundle

@@ -188 +188 @@
 {{{
 #!sh
-$ git merge feature_X
+$ git merge feature_X --no-ff
 ...
 Automatic merge failed; fix conflicts and then commit the result.
@@ -219 +219 @@
 
 {{{
-$ git merge feature_X
+$ git merge feature_X --no-ff
 ...
 Auto-merging Makefile.am