From: Gustaf Hendeby <hendeby@isy.liu.se>
To: Git Mailing List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [Fwd: Re: git merge vs git commit]
Date: Tue, 09 Sep 2008 19:58:28 +0200 [thread overview]
Message-ID: <48C6B944.30900@isy.liu.se> (raw)
Sorry for the dup Junio, once again hit the wrong button when answering...
/Gustaf
-------- Original Message --------
Subject: Re: git merge vs git commit
Date: Tue, 09 Sep 2008 19:56:20 +0200
From: Gustaf Hendeby <hendeby@isy.liu.se>
To: Junio C Hamano <gitster@pobox.com>
References: <20080909165236.GA8850@flint.arm.linux.org.uk>
<7vhc8p6x59.fsf@gitster.siamese.dyndns.org>
On 2008-09-09 19:34, Junio C Hamano wrote:
> 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?
I get the same result with current next. Is this the expected result
with this work, or an unwanted side effect?
/Gustaf
reply other threads:[~2008-09-09 17:59 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=48C6B944.30900@isy.liu.se \
--to=hendeby@isy.liu.se \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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 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 NNTP newsgroup(s).