From: Junio C Hamano <gitster@pobox.com>
To: Miklos Vajna <vmiklos@suse.cz>
Cc: Michael Haggerty <mhagger@alum.mit.edu>, git@vger.kernel.org
Subject: Re: [PATCH] merge: allow using --no-ff and --ff-only at the same time
Date: Mon, 01 Jul 2013 09:43:13 -0700 [thread overview]
Message-ID: <7va9m6i63i.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20130701161009.GI17269@suse.cz> (Miklos Vajna's message of "Mon, 1 Jul 2013 18:10:09 +0200")
Miklos Vajna <vmiklos@suse.cz> writes:
> OK, so if I get it right, the problem is that users got used to
> that the --ff-only not only means a precondition for the merge,
> but also means "either don't create a merge commit or fail", while
> my patch would change this second behaviour.
It is not just "users got used to". "We do not want to create a
merge commit with this operation." is what "--ff-only" means from
the day one [*1*].
For a merge not to create an extra merge commit, the other history
has to be a proper descendant, but that "precondition" is a mere
logical consequence of the ultimate goal of the mode.
> I could imagine then new switches, like 'git merge --pre=ff
> --update=no-ff" could provide these, though I'm not sure if it makes
> sense to add such generic switches till the only user is "ff".
Yes, that is why I said "if one were designing it from scratch, I
could see..." in a very weak form.
[Footnote]
*1* 13474835 (Teach 'git merge' and 'git pull' the option --ff-only,
2009-10-29) and also $gmane/107768 whose documentation part says:
"Refuse to merge unless the merge is resolved as a fast-forward."
next prev parent reply other threads:[~2013-07-01 16:43 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-01 7:01 [PATCH] merge: allow using --no-ff and --ff-only at the same time Miklos Vajna
2013-07-01 14:52 ` Michael Haggerty
2013-07-01 15:27 ` Miklos Vajna
2013-07-01 15:38 ` Junio C Hamano
2013-07-01 16:10 ` Miklos Vajna
2013-07-01 16:43 ` Junio C Hamano [this message]
2013-07-01 19:54 ` [PATCH] merge: handle --ff/--no-ff/--ff-only as a tri-state option Miklos Vajna
2013-07-01 20:27 ` Junio C Hamano
2013-07-02 8:42 ` Michael Haggerty
2013-07-02 14:47 ` [PATCH v2] " Miklos Vajna
2013-07-02 20:12 ` Junio C Hamano
2013-07-02 18:46 ` [PATCH] " Junio C Hamano
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=7va9m6i63i.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--cc=vmiklos@suse.cz \
/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).