Autogenerated man pages for v1.3.3-g63df

[git.git] / man1 / git-merge-base.1

diff --git a/man1/git-merge-base.1 b/man1/git-merge-base.1
index 6d466c5..e7a6a65 100755 (executable)
--- a/man1/git-merge-base.1
+++ b/man1/git-merge-base.1
@@ -23,16 +23,25 @@ git-merge-base \- Finds as good a common ancestor as possible for a merge
 .SH "SYNOPSIS"
 
 
-git\-merge\-base <commit> <commit>
+\fIgit\-merge\-base\fR [\-\-all] <commit> <commit>
 
 .SH "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 \fIgit\-merge\-base A B\fR 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...
 
+.SH "OPTIONS"
+
+.TP
+\-\-all
+Output all common ancestors for the two commits instead of just one\&.
+
 .SH "AUTHOR"