summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-base.txt
diff options
context:
space:
mode:
authorMichael J Gruber <git@drmicha.warpmail.net>2009-08-05 09:59:19 +0200
committerJunio C Hamano <gitster@pobox.com>2009-08-05 10:28:05 -0700
commit995bdc73fe0e28d622af0897440f0ea298345585 (patch)
treeb63d21fb26cd87f2b2ea741898df76007d96ae42 /Documentation/git-merge-base.txt
parent30ca4ca7b25082574d93b3a6d46a966d39de0488 (diff)
downloadgit-995bdc73fe0e28d622af0897440f0ea298345585.tar.gz
git-merge-base/git-show-branch: Cleanup documentation and usage
Make sure that usage strings and documentation coincide with each other and with the actual code. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-base.txt')
-rw-r--r--Documentation/git-merge-base.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt
index 767486c770..00e400353c 100644
--- a/Documentation/git-merge-base.txt
+++ b/Documentation/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
@@ -29,6 +29,7 @@ the given two commits.
OPTIONS
-------
+-a::
--all::
Output all merge bases for the commits, instead of just one.