diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-08-05 21:21:39 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-08-05 21:21:39 +0000 |
| commit | fd9274d4a1afb62d888e84717c5f0e67850fc96a (patch) | |
| tree | ccb7a2a797999c806efe4f173d344e06856c4ad2 /git-merge-base.txt | |
| parent | bacccdab7c8f70ad9471c1b7143b08a0831f2348 (diff) | |
| download | git-htmldocs-fd9274d4a1afb62d888e84717c5f0e67850fc96a.tar.gz | |
Autogenerated HTML docs for v1.6.4-53-g3f55e
Diffstat (limited to 'git-merge-base.txt')
| -rw-r--r-- | git-merge-base.txt | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/git-merge-base.txt b/git-merge-base.txt index 767486c77..ce5b36998 100644 --- a/git-merge-base.txt +++ b/git-merge-base.txt @@ -8,12 +8,12 @@ git-merge-base - Find as good common ancestors as possible for a merge SYNOPSIS -------- -'git merge-base' [--all] <commit> <commit>... +'git merge-base' [-a|--all] <commit> <commit>... DESCRIPTION ----------- -'git-merge-base' finds best common ancestor(s) between two commits to use +'git merge-base' finds best common ancestor(s) between two commits to use in a three-way merge. One common ancestor is 'better' than another common ancestor if the latter is an ancestor of the former. A common ancestor that does not have any better common ancestor is a 'best common @@ -27,8 +27,13 @@ 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 +from linkgit:git-show-branch[1] when used with the `--merge-base` option. + OPTIONS ------- +-a:: --all:: Output all merge bases for the commits, instead of just one. |