Re: Odd decision of git-pasky-0.7 to do a merge
- From
- Russell King <rmk@arm.linux.org.uk>
- Date
- Apr 29, 2005, 09:31 UTC
- Message-ID
- <20050429103059.A3260@flint.arm.linux.org.uk>
- In-Reply-To
- <20050429100717.A5035@flint.arm.linux.org.uk>
On Fri, Apr 29, 2005 at 10:07:17AM +0100, Russell King wrote:
Show 5 quoted lines
> 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