On Fri, 20 Oct 2006, Junio C Hamano wrote: > > I am not bold enough to say _exactly_ N places, but you missed > at least one more important one. Merge simplification favors > the earlier parents over later ones. Which is probably slightly inconsistent (although I seriously doubt anybody really cares - when we simplify a merge we obvioously do it exactly because the parents are identical wrt the files we are following). Most of the rest of commit traversal tend to have a rule that says "traverse youngest parent first", simply by virtue of the fact that revlist() normally pops off the queue in date order. But Jakub is certainly correct that when we do "^" we just take the first one. And "gitweb" does consider the first one special, since it shows diffs against that one (although I've argued that it probably shouldn't, and that there should be some way to show branches against arbitrary parents) So we're a bit confused. Not that it probably really ever matters. We might as well say that parent order is random, and that our "random number generators" are pretty damn lazy ;) Linus - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html