From: Anatoly Borodin <anatoly.borodin@gmail.com>
To: git@vger.kernel.org
Subject: Why "You cannot combine --squash with --no-ff" in git merge?
Date: Tue, 21 Mar 2017 01:57:13 +0000 (UTC) [thread overview]
Message-ID: <oaq19p$kpo$1@blaine.gmane.org> (raw)
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:
A---B1---B2---B3---B4---B
`git checkout A && git merge --squash --no-ff B` says:
fatal: You cannot combine --squash with --no-ff.
`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.
This can of course be done with `git rebase --interactive` and marking
all commits for squash or fixup. But `git merge --squash` works with
not-fastforwarding feature branch, why should it refuse to work in a
fastforwarding case?
--
Mit freundlichen Grüßen,
Anatoly Borodin
next reply other threads:[~2017-03-21 1:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-21 1:57 Anatoly Borodin [this message]
2017-03-21 2:11 ` Why "You cannot combine --squash with --no-ff" in git merge? Anatoly Borodin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='oaq19p$kpo$1@blaine.gmane.org' \
--to=anatoly.borodin@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).