From: A Large Angry SCM <gitzilla@gmail.com>
To: martin.langhoff@gmail.com, Russell King <rmk@arm.linux.org.uk>
Cc: Linus Torvalds <torvalds@osdl.org>,
Wayne Scott <wsc9tt@gmail.com>,
git@vger.kernel.org
Subject: Re: bogus merges
Date: Sun, 11 Sep 2005 11:11:49 -0400 [thread overview]
Message-ID: <43244935.6060703@gmail.com> (raw)
In-Reply-To: <46a038f905091104483cc01a11@mail.gmail.com>
Martin Langhoff wrote:
> On 9/11/05, Russell King <rmk@arm.linux.org.uk> wrote:
>>On Mon, Sep 05, 2005 at 09:01:32AM -0700, Linus Torvalds wrote:
>>>I suspect rmk is using cogito-0.13
>>Correct, and rmk will probably be extremely nervous about upgrading when
>>0.14 appears.
>
> Well, *actually* cogito-0.13 didn't include git-core, so we have to
> look for the reasons elsewhere. Could be the leftover MERGE_HEAD
> Daniel mentions.
>
> Russel, can you confirm what git-core version you are/were running?
Russel,
How are you updating your tree to Linus'? If you are rsyncing from
kernel.org, you're probably getting a MERGE_HEAD with the rsync. A while
ago I got annoyed enough add the equivalent of:
rm -f ${LOCAL_REPOS}/.git/MERGE_HEAD
to my (very stupid) git rsync script.
next prev parent reply other threads:[~2005-09-11 15:12 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-05 14:38 bogus merges Wayne Scott
2005-09-05 16:01 ` Linus Torvalds
2005-09-06 13:08 ` Wayne Scott
2005-09-11 11:06 ` Russell King
2005-09-06 18:28 ` Daniel Barkalow
2005-09-11 11:01 ` Russell King
2005-09-11 18:08 ` Daniel Barkalow
2005-09-12 0:58 ` Petr Baudis
2005-09-11 10:21 ` Russell King
2005-09-11 11:48 ` Martin Langhoff
2005-09-11 15:11 ` A Large Angry SCM [this message]
2005-09-11 18:36 ` Russell King
2005-09-11 18:00 ` Russell King
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=43244935.6060703@gmail.com \
--to=gitzilla@gmail.com \
--cc=git@vger.kernel.org \
--cc=martin.langhoff@gmail.com \
--cc=rmk@arm.linux.org.uk \
--cc=torvalds@osdl.org \
--cc=wsc9tt@gmail.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).