| commit | aa8f98c1bfcf162e0bd23d20c34857940f2c2256 | |
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Tue, 17 Aug 2010 07:01:15 +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 | 7defce780500efc5e152b080e67143e22255829e | treesnapshot (tar.gz zip) |
| parent | 1846e9edf6b9c8b8e84b96eab8753a1420b6b28d | commitdiff |
merge-base --octopus to mimic show-branch --merge-base
While show-branch --merge-base does not support more than MAX_REVS
revs, git supports more with a different algorithm
(v1.6.0-rc0~51^2~13, Introduce get_octopus_merge_bases() in commit.c,
2008-06-27). Expose that functionality.
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 --merge-base does not support more than MAX_REVS
revs, git supports more with a different algorithm
(v1.6.0-rc0~51^2~13, Introduce get_octopus_merge_bases() in commit.c,
2008-06-27). Expose that functionality.
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 |