Changes between Version 9 and Version 10 of GitCreateBundle


Ignore:
Timestamp:
Oct 23, 2013, 2:20:33 PM (11 years ago)
Author:
Piero Campalani
Comment:

Add —no-ff

Legend:

Unmodified
Added
Removed
Modified
  • GitCreateBundle

    v9 v10  
    188188{{{
    189189#!sh
    190 $ git merge feature_X
     190$ git merge feature_X --no-ff
    191191...
    192192Automatic merge failed; fix conflicts and then commit the result.
     
    219219
    220220{{{
    221 $ git merge feature_X
     221$ git merge feature_X --no-ff
    222222...
    223223Auto-merging Makefile.am