From: Junio C Hamano <gitster@pobox.com>
To: Miklos Vajna <vmiklos@frugalware.org>
Cc: Russell King <rmk@arm.linux.org.uk>, git@vger.kernel.org
Subject: Re: git merge vs git commit
Date: Tue, 09 Sep 2008 12:11:34 -0700 [thread overview]
Message-ID: <7vd4jd6snt.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20080909185418.GI4829@genesis.frugalware.org> (Miklos Vajna's message of "Tue, 9 Sep 2008 20:54:18 +0200")
Miklos Vajna <vmiklos@frugalware.org> writes:
> On Tue, Sep 09, 2008 at 10:34:42AM -0700, Junio C Hamano <gitster@pobox.com> wrote:
>> I think some changes went into 1.6.0 around this area to (r)eject parents
>> that are redundant.
>
> Yes, it was your 98cf9c3 (Introduce reduce_heads(), 2008-06-27).
That does not necessarily mean git-merge (or git-merge-octopus) uses that
C function when coming up with the set of commits to record as parents.
As to what the correct behaviour is, I personally do not have a strong
preference either way.
- If you specify a fast-foward on the command line to merge into your
HEAD, that is your choice and you may deserve the extra parent, even if
it is redundant.
- On the other hand, if you try to merge a single fast-forward, we do not
even create a merge commit, so in the same spirit it may be better if
we dropped the original HEAD from the merged result (i.e. Russell's
"cleanly merged" case).
I dunno.
next prev parent reply other threads:[~2008-09-09 19:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-09 16:52 git merge vs git commit Russell King
2008-09-09 17:34 ` Junio C Hamano
2008-09-09 18:54 ` Miklos Vajna
2008-09-09 19:11 ` Junio C Hamano [this message]
2008-09-09 21:32 ` Matthieu Moy
-- strict thread matches above, loose matches on Subject: below --
2008-09-10 17:42 Ulrik Sverdrup
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vd4jd6snt.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
--cc=vmiklos@frugalware.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.