Hi Christoph, On Sun, 17 Apr 2016, Christoph Paulik wrote: > git merge branch --no-commit does commit fast forward merges leaving > users no way to change the merge results. No, this is not a bug. Please note that a fast-forward does not perform a commit at all (and therefore "does commit fast forward" is an inaccurate description). > The command only works as expected when also adding the --no-ff flag. Then you need to fix your expectations ;-) A fast-forward *avoids* committing altogether. In that light, the current behavior is correct. Ciao, Johannes -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html