summaryrefslogtreecommitdiff
path: root/Documentation/git-fmt-merge-msg.txt
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-08-17 07:01:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-18 21:02:03 (GMT)
commita1e0ad78b784fd7c47c7bc2847f4813aca4cebaf (patch)
tree94410dc1d6748279fa90c9f402fcaec900e0b021 /Documentation/git-fmt-merge-msg.txt
parentaa8f98c1bfcf162e0bd23d20c34857940f2c2256 (diff)
downloadgit-a1e0ad78b784fd7c47c7bc2847f4813aca4cebaf.zip
git-a1e0ad78b784fd7c47c7bc2847f4813aca4cebaf.tar.gz
git-a1e0ad78b784fd7c47c7bc2847f4813aca4cebaf.tar.bz2
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 'Documentation/git-fmt-merge-msg.txt')
0 files changed, 0 insertions, 0 deletions