Re: Why "You cannot combine --squash with --no-ff" in git merge?

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 wrote: > `git merge --squash --ff` will happily move the A ref to the B commit. > > But what I want, and expect, is: > > A---B' > >

Why "You cannot combine --squash with --no-ff" in git merge?

Hi All, the message "You cannot combine --squash with --no-ff" appeared in 2008, in the commit 1c7b76be7d620bbaf2e6b8417f04012326bbb9df ("Build in merge"). I don't understand the logic of this restriction. Imagine, I have the following branches, where A is a master and B is a feature branch: