diff options
| author |  Jonathan Nieder <jrnieder@gmail.com> | 2010-08-17 02:01:54 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-08-18 14:02:03 -0700 |
| commit | a1e0ad78b784fd7c47c7bc2847f4813aca4cebaf (patch) | |
| tree | 94410dc1d6748279fa90c9f402fcaec900e0b021 /archive.h | |
| parent | merge-base --octopus to mimic show-branch --merge-base (diff) | |
| download | tgif-a1e0ad78b784fd7c47c7bc2847f4813aca4cebaf.tar.xz | |
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>
Diffstat (limited to 'archive.h')
0 files changed, 0 insertions, 0 deletions