diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2010-08-17 02:01:15 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-08-18 14:02:03 -0700 |
| commit | aa8f98c1bfcf162e0bd23d20c34857940f2c2256 (patch) | |
| tree | 7defce780500efc5e152b080e67143e22255829e /sha1_file.c | |
| parent | Documentation: add a SEE ALSO section for merge-base (diff) | |
| download | tgif-aa8f98c1bfcf162e0bd23d20c34857940f2c2256.tar.xz | |
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>
Diffstat (limited to 'sha1_file.c')
0 files changed, 0 insertions, 0 deletions