summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-base.txt
diff options
context:
space:
mode:
authorFredrik Kuivinen <freku045@student.liu.se>2006-05-16 05:58:15 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-16 06:19:46 (GMT)
commit2aa839614e9d4f8b84803fb4ce633d6a0981675f (patch)
tree74ad9150fd6f157ca6b3aec8924f2897f6e144b5 /Documentation/git-merge-base.txt
parent1b9bc5a7b7434d771726011613a00cb202bd9f44 (diff)
downloadgit-2aa839614e9d4f8b84803fb4ce633d6a0981675f.zip
git-2aa839614e9d4f8b84803fb4ce633d6a0981675f.tar.gz
git-2aa839614e9d4f8b84803fb4ce633d6a0981675f.tar.bz2
Update the documentation for git-merge-base
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-merge-base.txt')
-rw-r--r--Documentation/git-merge-base.txt18
1 files changed, 14 insertions, 4 deletions
diff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt
index d1d56f1..6099be2 100644
--- a/Documentation/git-merge-base.txt
+++ b/Documentation/git-merge-base.txt
@@ -8,16 +8,26 @@ git-merge-base - Finds as good a common ancestor as possible for a merge
SYNOPSIS
--------
-'git-merge-base' <commit> <commit>
+'git-merge-base' [--all] <commit> <commit>
DESCRIPTION
-----------
-"git-merge-base" finds as good a common ancestor as possible. Given a
-selection of equally good common ancestors it should not be relied on
-to decide in any particular way.
+
+"git-merge-base" finds as good a common ancestor as possible between
+the two commits. That is, given two commits A and B 'git-merge-base A
+B' will output a commit which is reachable from both A and B through
+the parent relationship.
+
+Given a selection of equally good common ancestors it should not be
+relied on to decide in any particular way.
The "git-merge-base" algorithm is still in flux - use the source...
+OPTIONS
+-------
+--all::
+ Output all common ancestors for the two commits instead of
+ just one.
Author
------