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.boro...@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
