From: Junio C Hamano <gitster@pobox.com>
To: Miklos Vajna <vmiklos@frugalware.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>, git@vger.kernel.org
Subject: Re: Octopus merge: unique (?) to git, but is it useful?
Date: Tue, 03 Jun 2008 17:33:36 -0700 [thread overview]
Message-ID: <7vbq2i11jz.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20080603231151.GR29404@genesis.frugalware.org> (Miklos Vajna's message of "Wed, 4 Jun 2008 01:11:51 +0200")
Miklos Vajna <vmiklos@frugalware.org> writes:
> On Tue, Jun 03, 2008 at 07:40:21AM -0700, Linus Torvalds <torvalds@linux-foundation.org> wrote:
>> Right. But git shouldn't do duplicate parents. I agree it's a mis-use of
>> git merge, but either we should have errored out or we should have pruned
>> the parents.
>>
>> Yes, the end result is "tecnically correct", but it's not optimal.
>
> I think the current git-merge.sh already handles this: 6ea23343
> introduced the usage of git-show-branch --independent to filter out
> duplicated parents.
Good eyes. I guess I was sloppy when I wrote the log message for that
one and failed to talk about the bugfix ;-).
next prev parent reply other threads:[~2008-06-04 0:34 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-03 1:14 Octopus merge: unique (?) to git, but is it useful? Jakub Narebski
2008-06-03 2:05 ` Linus Torvalds
2008-06-03 3:56 ` Junio C Hamano
2008-06-03 5:17 ` Junio C Hamano
2008-06-03 5:28 ` Johannes Schindelin
2008-06-03 5:42 ` Junio C Hamano
2008-06-03 8:31 ` Johannes Schindelin
2008-06-03 10:40 ` SZEDER Gábor
2008-06-03 19:30 ` Junio C Hamano
2008-06-03 20:39 ` SZEDER Gábor
2008-06-03 22:08 ` Junio C Hamano
2008-06-03 23:10 ` SZEDER Gábor
2008-06-04 0:35 ` Jeff King
2008-06-04 1:02 ` Junio C Hamano
2008-06-03 14:40 ` Linus Torvalds
2008-06-03 23:11 ` Miklos Vajna
2008-06-04 0:33 ` Junio C Hamano [this message]
2008-06-03 4:29 ` Junio C Hamano
2008-06-03 6:39 ` Jakub Narebski
2008-06-03 7:11 ` Junio C Hamano
2008-06-03 7:32 ` Jakub Narebski
2008-06-03 7:53 ` Junio C Hamano
2008-06-03 19:54 ` Linus Torvalds
2008-06-03 20:27 ` Commit annotations (was:: Octopus merge: unique (?) to git, but is it useful?) Jakub Narebski
2008-06-03 20:33 ` Johannes Schindelin
2008-06-03 23:59 ` Johan Herland
2008-06-03 2:16 ` Octopus merge: unique (?) to git, but is it useful? Daniel Villeneuve
2008-06-03 10:06 ` Matthieu Moy
2008-06-03 11:27 ` Jakub Narebski
2008-06-03 11:53 ` Matthieu Moy
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=7vbq2i11jz.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--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.