From: Junio C Hamano <gitster@pobox.com>
To: "SZEDER Gábor" <szeder@ira.uka.de>
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 12:30:34 -0700 [thread overview]
Message-ID: <7vabi22u5h.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20080603104009.GA559@neumann> (SZEDER Gábor's message of "Tue, 3 Jun 2008 12:40:09 +0200")
SZEDER Gábor <szeder@ira.uka.de> writes:
> On Mon, Jun 02, 2008 at 10:17:42PM -0700, Junio C Hamano wrote:
>> commit: drop duplicated parents
> have you actually tried the testcase 'Hand committing of a redundant
> merge removes dups' that you included with this commit (67bfc03)?
Yes, three times (because it is in three integration branches 'master',
'next' and 'pu') on two different machines (my primary development machine
and my k.org account before pushing the results out).
... and I just updated two of my office boxes.
> ... It
> fails at the line 'EDITOR=: git commit -a'.
Sorry, because it works for me (and presumably for many others --- I
haven't seen anybody else reporting the breakage you have), you need to
help others to diagnose it with a bit more details.
next prev parent reply other threads:[~2008-06-03 19:31 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 [this message]
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
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=7vabi22u5h.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=szeder@ira.uka.de \
--cc=torvalds@linux-foundation.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 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).