| commit | a1e0ad78b784fd7c47c7bc2847f4813aca4cebaf | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Tue, 17 Aug 2010 07:01:54 +0000 (17 02:01 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Aug 2010 21:02:03 +0000 (18 14:02 -0700) | ||
| tree | 94410dc1d6748279fa90c9f402fcaec900e0b021 | treesnapshot (tar.gz zip) |
| parent | aa8f98c1bfcf162e0bd23d20c34857940f2c2256 | commitdiff |
merge-base --independent to print reduced parent list in a merge
While show-branch --independent does not support more than MAX_REVS
revs, git internally supports more with a different algorithm.
Expose that functionality as "git merge-base --independent".
This should help scripts to catch up with builtin merge in supporting
dodecapus.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
While show-branch --independent does not support more than MAX_REVS
revs, git internally supports more with a different algorithm.
Expose that functionality as "git merge-base --independent".
This should help scripts to catch up with builtin merge in supporting
dodecapus.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-merge-base.txt | diffblobblamehistory | |
| builtin/merge-base.c | diffblobblamehistory | |
| t/t6010-merge-base.sh | diffblobblamehistory |