From: Russell King <rmk@arm.linux.org.uk>
To: Linus Torvalds <torvalds@osdl.org>
Cc: git@vger.kernel.org
Subject: Re: Odd decision of git-pasky-0.7 to do a merge
Date: Fri, 29 Apr 2005 21:52:50 +0100 [thread overview]
Message-ID: <20050429215250.E30010@flint.arm.linux.org.uk> (raw)
In-Reply-To: <Pine.LNX.4.58.0504291043060.18901@ppc970.osdl.org>; from torvalds@osdl.org on Fri, Apr 29, 2005 at 10:44:29AM -0700
On Fri, Apr 29, 2005 at 10:44:29AM -0700, Linus Torvalds wrote:
> On Fri, 29 Apr 2005, Russell King wrote:
> > Why it decided that a merge was necessary is beyond me. Any ideas?
> > Did Linus forget to merge his tree properly?
>
> It looks like it was unable to find the right common ancestor.
>
> If you only had my stuff in it, the common ancestor _should_ have been the
> parent (c60c390620e0abb60d4ae8c43583714bda27763f), which _should_ have
> been your old top.
>
> But maybe merge-base didn't work right?
Yup - pasky-0.7 came out with some weird commit-id, but cogito-0.8
got it right. Now using cogito-0.8 here, so I'm no longer concerned
about this particular problem.
--
Russell King
prev parent reply other threads:[~2005-04-29 20:55 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-04-29 7:36 Odd decision of git-pasky-0.7 to do a merge Russell King
2005-04-29 9:07 ` Russell King
2005-04-29 9:31 ` Russell King
2005-04-29 18:21 ` Petr Baudis
2005-04-29 17:44 ` Linus Torvalds
2005-04-29 20:52 ` Russell King [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=20050429215250.E30010@flint.arm.linux.org.uk \
--to=rmk@arm.linux.org.uk \
--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.