Re: Bug in merge-base

2005-04-19 Thread Daniel Barkalow
On Wed, 20 Apr 2005, Petr Baudis wrote: > Dear diary, on Wed, Apr 20, 2005 at 12:17:12AM CEST, I got a letter > where Daniel Barkalow <[EMAIL PROTECTED]> told me that... > > > I can think of. Are you sure there isn't another path to 5b53d3? > > I'm not. Actually there well might be. > > I think

Bug in merge-base

2005-04-19 Thread Petr Baudis
Hello, I've hit a strange bug in merge-base I don't want to debug now. ;-) I've been doing my regular git pull test from my main branch, but suddenly git merge wanted to do a tree merge instead of fast-forward. What went wrong? The commits tree looks like: 3