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 /Documentation/git-merge-base.txt | |
| parent | aa8f98c1bfcf162e0bd23d20c34857940f2c2256 (diff) | |
| download | git-a1e0ad78b784fd7c47c7bc2847f4813aca4cebaf.tar.gz | |
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-merge-base.txt')
| -rw-r--r-- | Documentation/git-merge-base.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt index 125207ef1e..eedef1bb1a 100644 --- a/Documentation/git-merge-base.txt +++ b/Documentation/git-merge-base.txt @@ -8,7 +8,9 @@ git-merge-base - Find as good common ancestors as possible for a merge SYNOPSIS -------- +[verse] 'git merge-base' [-a|--all] [--octopus] <commit> <commit>... +'git merge-base' --independent <commit>... DESCRIPTION ----------- @@ -42,6 +44,13 @@ OPTIONS in preparation for an n-way merge. This mimics the behavior of 'git show-branch --merge-base'. +--independent:: + Instead of printing merge bases, print a minimal subset of + the supplied commits with the same ancestors. In other words, + among the commits given, list those which cannot be reached + from any other. This mimics the behavior of 'git show-branch + --independent'. + DISCUSSION ---------- |