diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-09-03 21:33:06 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-09-03 21:33:06 +0000 |
| commit | 2db3e750d172a78dadfb29235ad2a2c3c8d45a24 (patch) | |
| tree | 1f66627398f37b23ec3af2697514d33d25060d96 /git-merge-base.txt | |
| parent | d7ae629d13f3242b66070b20f4bb83486948150a (diff) | |
| download | git-htmldocs-2db3e750d172a78dadfb29235ad2a2c3c8d45a24.tar.gz | |
Autogenerated HTML docs for v1.7.2.3-313-gcd15
Diffstat (limited to 'git-merge-base.txt')
| -rw-r--r-- | git-merge-base.txt | 34 |
1 files changed, 27 insertions, 7 deletions
diff --git a/git-merge-base.txt b/git-merge-base.txt index ce5b36998..eedef1bb1 100644 --- a/git-merge-base.txt +++ b/git-merge-base.txt @@ -8,7 +8,9 @@ git-merge-base - Find as good common ancestors as possible for a merge SYNOPSIS -------- -'git merge-base' [-a|--all] <commit> <commit>... +[verse] +'git merge-base' [-a|--all] [--octopus] <commit> <commit>... +'git merge-base' --independent <commit>... DESCRIPTION ----------- @@ -20,12 +22,12 @@ that does not have any better common ancestor is a 'best common ancestor', i.e. a 'merge base'. Note that there can be more than one merge base for a pair of commits. -Among the two commits to compute the merge base from, one is specified by -the first commit argument on the command line; the other commit is a -(possibly hypothetical) commit that is a merge across all the remaining -commits on the command line. As the most common special case, specifying only -two commits on the command line means computing the merge base between -the given two commits. +Unless `--octopus` is given, among the two commits to compute the merge +base from, one is specified by the first commit argument on the command +line; the other commit is a (possibly hypothetical) commit that is a merge +across all the remaining commits on the command line. As the most common +special case, specifying only two commits on the command line means +computing the merge base between the given two commits. As a consequence, the 'merge base' is not necessarily contained in each of the commit arguments if more than two commits are specified. This is different @@ -37,6 +39,18 @@ OPTIONS --all:: Output all merge bases for the commits, instead of just one. +--octopus:: + Compute the best common ancestors of all supplied commits, + 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 ---------- @@ -96,6 +110,12 @@ Documentation -------------- Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. +See also +-------- +linkgit:git-rev-list[1], +linkgit:git-show-branch[1], +linkgit:git-merge[1] + GIT --- Part of the linkgit:git[1] suite |