Re: git merge branch --no-commit does commit fast forward merges
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Apr 18, 2016, 06:26 UTC
- Message-ID
- <alpine.DEB.2.20.1604180825170.2967@virtualbox>
- In-Reply-To
- <874mb0kkkk.fsf@gmail.com>
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