From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 17 Apr 2012 01:22:47 GMT
Subject: Re: What's cooking in git.git (Apr 2012, #05; Thu, 12)
Message-ID: <CA+55aFzGwPYNn2baFhEr4msBTV7__nkTSUqAZ7=PRVoYrchV5w@mail.gmail.com>
In-Reply-To: <20120416233218.54daa2f6@gmail.com>

2012/4/16 Michał Kiedrowicz <michal.kiedrowicz@gmail.com>:
>
> So, the difference is that `git merge --no-ff HEAD^` used to work, now
> it doesn't because we reduce_heads() only if we allow fast-forward (and
> even though there is just one remote we merge with, parents contains
> two commits). So what about that trivial patch instead (discarding our
> previous patches)?

Yes, I suspect this might work.

And I like how reducing the remoteheads should also automatically fix
the case of the commit messages containing redundant information when
you give the same branch multiple times (assuming you have the whole
merge log thing enabled).

                     Linus