From: Jeff Garzik <jgarzik@pobox.com>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: 'git commit' duplicates parents?
Date: Sun, 19 Jun 2005 22:28:16 -0400 [thread overview]
Message-ID: <42B629C0.6030008@pobox.com> (raw)
In-Reply-To: <Pine.LNX.4.58.0506191921270.2268@ppc970.osdl.org>
Linus Torvalds wrote:
> As to why you had a .git/MERGE_HEAD in your tree, it's probably because
> your merge scripts haven't kept up with mine.
Nope, I use vanilla latest ones. FWIW my setup is 100% vanilla git plus
two small scripts, 'git-switch-tree' and 'git-new-branch', which switch
around .git/HEAD.
Doing some experimenting, it seems that git-pull-script does not remove
MERGE_HEAD and ORIG_HEAD after its done.
This is reproducible by updating vanilla linux-2.6.git using vanilla
git-pull-script. Just a standard update-to-latest-kernel, with no
conflicts/merges/etc.
Jeff
next prev parent reply other threads:[~2005-06-20 2:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-06-19 16:27 'git commit' duplicates parents? Jeff Garzik
2005-06-19 16:32 ` Jeff Garzik
2005-06-20 2:24 ` Linus Torvalds
2005-06-20 2:28 ` Jeff Garzik [this message]
2005-06-20 2:33 ` Linus Torvalds
2005-06-20 2:40 ` Jeff Garzik
2005-06-20 3:00 ` Linus Torvalds
2005-06-20 9:48 ` Dan Holmsand
2005-06-20 15:11 ` Linus Torvalds
2005-06-20 17:20 ` Dan Holmsand
2005-06-20 17:44 ` Linus Torvalds
2005-06-20 18:52 ` Dan Holmsand
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=42B629C0.6030008@pobox.com \
--to=jgarzik@pobox.com \
--cc=git@vger.kernel.org \
--cc=torvalds@osdl.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.