From: Anatoly Borodin <anatoly.borodin@gmail.com>
Date: Tue, 21 Mar 2017 02:11:50 GMT
Subject: Re: Why "You cannot combine --squash with --no-ff" in git merge?
Message-ID: <oaq256$u33$1@blaine.gmane.org>
In-Reply-To: <oaq19p$kpo$1@blaine.gmane.org>

Hi All,


I made a mistake in the previous message. I'm really sorry, I need to go
have some sleep right now.

Anatoly Borodin <anatoly.borodin@gmail.com> wrote:
> `git merge --squash --ff` will happily move the A ref to the B commit.
> 
> But what I want, and expect, is:
> 
>         A---B'
> 
> where B' has the same tree as B.

`git merge --squash --ff` WILL create A---B'.

But it's still unclear to me why `git merge --squash --no-ff` should
fail instead of doing the same as `git merge --squash --ff` does. The
error message and the documentation do not give any good reasons for it.

PS In my case, I set `merge.ff=false` and run just `git merge --squash`.


-- 
Mit freundlichen Grüßen,
Anatoly Borodin