| commit | b6b15db3f464b18180eee79927cb324fd63e15ff | |
| author | Daniel Barkalow <barkalow@iabervon.org> | |
| Sun, 24 Apr 2005 01:47:23 +0000 (23 18:47 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Sun, 24 Apr 2005 01:47:23 +0000 (23 18:47 -0700) | ||
| tree | c39c3027cb15e3d014f959c07794f96b4d4218ea | treesnapshot (tar.gz zip) |
| parent | 8237b1854c64492ab5772994b4ac4efd7f1c2fc0 | commitdiff |
[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>
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 | diffblobblamehistory |