From: Dave Jones <davej@redhat.com>
To: Linus Torvalds <torvalds@osdl.org>
Cc: git@vger.kernel.org
Subject: Re: merging problems with Linus' kernel tree.
Date: Tue, 21 Feb 2006 15:29:35 -0500 [thread overview]
Message-ID: <20060221202935.GC24159@redhat.com> (raw)
In-Reply-To: <Pine.LNX.4.64.0602211153570.30245@g5.osdl.org>
On Tue, Feb 21, 2006 at 12:03:04PM -0800, Linus Torvalds wrote:
> That, in turn, is usually due to an aborted merge.
Hmm. (Recalls a power outage a few days ago).
I'll bet that's when it happened.
> Do a "git checkout -f".
Fixed, thanks.
Dave
prev parent reply other threads:[~2006-02-21 20:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-21 18:33 merging problems with Linus' kernel tree Dave Jones
2006-02-21 18:55 ` Linus Torvalds
2006-02-21 19:19 ` Dave Jones
2006-02-21 20:03 ` Linus Torvalds
2006-02-21 20:29 ` Dave Jones [this message]
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=20060221202935.GC24159@redhat.com \
--to=davej@redhat.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 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).