On Sun, Apr 17, 2016 at 2:10 PM, Christoph Paulik <cpaulik@xxxxxxxxx> wrote: > > Hi Git Mailinglist, > git merge branch --no-commit does commit fast forward merges leaving users > no way to change the merge results. The command only works as expected when > also adding the --no-ff flag. Looking at the help text of the --no-commit > flag I think that this might be a unintended. > I've tested this on git 2.8.0. > > This bug was first reported to magit > (https://github.com/magit/magit/issues/2620) whose maintainer then suggested > that it might be a git bug. > > Best regards, > Christoph > To be fair, the user can undo it with "git reset HEAD@{1}" I believe? Thanks, Jake -- 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