Dear diary, on Sun, Apr 17, 2005 at 06:51:59PM CEST, I got a letter where Daniel Barkalow <barkalow@iabervon.org> told me that... > merge-base finds one of the best common ancestors of a pair of commits. In > particular, it finds one of the ones which is fewest commits away from the > further of the heads. > > Signed-Off-By: Daniel Barkalow <barkalow@iabervon.org> Note that during merge with Linus (probably the most complicated I've got so far, but still thankfully not too painful thanks to the rej tool) I've decided to revert your merge-base in favour of Linus' version. I did this mainly to make me merging Linus less awful; we should probably clean it up first and decide which solution to go for in the first place before possibly replacing it again, I think. -- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Mon Apr 18 07:21:23 2005
This archive was generated by hypermail 2.1.8 : 2005-04-18 07:21:23 EST