Sergey Organov <[email protected]> writes: > This option allows to create merge commit when fast-forward is > possible, and abort otherwise. I.e. it's equivalent to --ff-only, > except that it finally creates merge commit instead of > fast-forwarding. > > One may also consider this option to be equivalent to --no-ff with > additional check that the command without --no-ff would indeed result > in fast-forward. > > Useful to incorporate topic branch as single merge commit, ensuring > the left-side of the merge has no changes (our-diff-empty-merge). > > Signed-off-by: Sergey Organov <[email protected]> > ---
The workflow this implements sounds like "because we can", not "because it will help us do X and Y and Z". Why would it be useful to limit the history to a shape where all merges are the ones that could have been fast-forwarded? I cannot justify that sensibly myself, which in turn makes the feature smell to me that it is encouraging a wrong workflow. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
