From: Russell King <rmk@arm.linux.org.uk>
To: git@vger.kernel.org
Subject: Re: Odd decision of git-pasky-0.7 to do a merge
Date: Fri, 29 Apr 2005 10:31:00 +0100 [thread overview]
Message-ID: <20050429103059.A3260@flint.arm.linux.org.uk> (raw)
In-Reply-To: <20050429100717.A5035@flint.arm.linux.org.uk>; from rmk@arm.linux.org.uk on Fri, Apr 29, 2005 at 10:07:17AM +0100
On Fri, Apr 29, 2005 at 10:07:17AM +0100, Russell King wrote:
> rmk@hera:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git(0)$ SHA1_FILE_DIRECTORY=./objects merge-base c60c390620e0abb60d4ae8c43583714bda27763f bdceb6a0162274934386f19f3ea5a9d44feb0b20
> bdceb6a0162274934386f19f3ea5a9d44feb0b20
>
> $ merge-base c60c390620e0abb60d4ae8c43583714bda27763f bdceb6a0162274934386f19f3ea5a9d44feb0b20
> e8108c98dd6d65613fa0ec9d2300f89c48d554bf
This is the problem. It seems that merge-base in git-pasky-0.7
doesn't work correctly.
--
Russell King
next prev parent reply other threads:[~2005-04-29 9:25 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 [this message]
2005-04-29 18:21 ` Petr Baudis
2005-04-29 17:44 ` Linus Torvalds
2005-04-29 20:52 ` 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=20050429103059.A3260@flint.arm.linux.org.uk \
--to=rmk@arm.linux.org.uk \
--cc=git@vger.kernel.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.