From: Junio C Hamano <gitster@pobox.com>
To: Russell King <rmk@arm.linux.org.uk>
Cc: git@vger.kernel.org
Subject: Re: git merge vs git commit
Date: Tue, 09 Sep 2008 10:34:42 -0700 [thread overview]
Message-ID: <7vhc8p6x59.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20080909165236.GA8850@flint.arm.linux.org.uk> (Russell King's message of "Tue, 9 Sep 2008 17:52:37 +0100")
Russell King <rmk@arm.linux.org.uk> writes:
> If there aren't any conflicts, you get a nice clean merge, resulting in:
> ...
> However, if you have a conflict that needs resolving, you fix it up as
> ...
> instead - an additional reference from commit 'K' back to commit 'A'
> which isn't present in the clean merge case.
>
> Is this intentional, or is it a bug?
I think some changes went into 1.6.0 around this area to (r)eject parents
that are redundant. What happens when you use more recent git with the
same example?
next prev parent reply other threads:[~2008-09-09 17:36 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 [this message]
2008-09-09 18:54 ` Miklos Vajna
2008-09-09 19:11 ` Junio C Hamano
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=7vhc8p6x59.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=rmk@arm.linux.org.uk \
/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.