projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8237b18) | patch
[PATCH] Replace merge-base implementation
authorDaniel Barkalow <barkalow@iabervon.org>
Sun, 24 Apr 2005 01:47:23 +0000 (18:47 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Sun, 24 Apr 2005 01:47:23 +0000 (18:47 -0700)
commitb6b15db3f464b18180eee79927cb324fd63e15ff
treec39c3027cb15e3d014f959c07794f96b4d4218eatree | snapshot
parent8237b1854c64492ab5772994b4ac4efd7f1c2fc0commit | diff
[PATCH] Replace merge-base implementation

The old implementation was a nice algorithm, but, unfortunately, it could
be confused in some cases and would not necessarily do the obvious thing
if one argument was decended from the other. This version fixes that by
changing the criterion to the most recent common ancestor.

Signed-Off-By: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
merge-base.c diff | blob | history
The core git plumbing