diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-07-04 18:46:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-09 03:38:12 -0700 |
| commit | f324943816789fa047441f66edbe11669dc8a9ab (patch) | |
| tree | a31bb33628df4630c3241732e697bed41a54d0e5 /t | |
| parent | ff4c848527137b5ca52dfe97c25fcc8bcc4b8726 (diff) | |
| download | git-f324943816789fa047441f66edbe11669dc8a9ab.tar.gz git-f324943816789fa047441f66edbe11669dc8a9ab.tar.xz | |
merge-base: update the clean-up postprocessing
This removes the "contaminate the well even more" approach
taken in the current merge-base postprosessing code. Instead,
when there are more than one merge-base results, we compute the
merge-base between them and see if one is a fast-forward of the
other, in which case the ancestor is removed from the result.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
0 files changed, 0 insertions, 0 deletions