Yann Droneaud <ydroneaud <at> opteya.com> writes: > > 3) Merge options can't be overridden. > > If I modify .git/config to set a merge option, for example forcing > fast-forward merge, this option cannot be overridden on command line: >
(git merge --no-ff-only --no-ff) should work. The --no-ff-only overrides the --ff-only configuration setting, and the --no-ff ensures that the merge is not a fast-forward. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
