list mirror (unofficial, one of many)
 help / color / Atom feed
From: Anatoly Borodin <>
Subject: Re: Why "You cannot combine --squash with --no-ff" in git merge?
Date: Tue, 21 Mar 2017 02:11:50 +0000 (UTC)
Message-ID: <oaq256$u33$> (raw)
In-Reply-To: <oaq19p$kpo$>

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'
> 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

      reply index

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-21  1:57 Anatoly Borodin
2017-03-21  2:11 ` Anatoly Borodin [this message]

Reply instructions:

You may reply publically 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:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='oaq256$u33$' \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link list mirror (unofficial, one of many)

Archives are clonable:
	git clone --mirror
	git clone --mirror http://ou63pmih66umazou.onion/git
	git clone --mirror http://czquwvybam4bgbro.onion/git
	git clone --mirror http://hjrcffqmbrq6wope.onion/git

Newsgroups are available over NNTP:

 note: .onion URLs require Tor:

AGPL code for this site: git clone public-inbox