@matheusbsbs / matheus-bagliano / commits / 2aa839614e
Fork 0

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>

Fredrik Kuivinen committed May 16, 2006 at 07:58 UTC 2aa839614e9d4f8b84803fb4ce633d6a0981675f
1 file changed +14 -4
Documentation/git-merge-base.txt
+14 -4
@@ -8,16 +8,26 @@ git-merge-base - Finds as good a common ancestor as possible for a merge
8
9 SYNOPSIS
10 --------
11 -'git-merge-base' <commit> <commit>
11 +'git-merge-base' [--all] <commit> <commit>
12
13 DESCRIPTION
14 -----------
15 -"git-merge-base" finds as good a common ancestor as possible. Given a
16 -selection of equally good common ancestors it should not be relied on
17 -to decide in any particular way.
15 +
16 +"git-merge-base" finds as good a common ancestor as possible between
17 +the two commits. That is, given two commits A and B 'git-merge-base A
18 +B' will output a commit which is reachable from both A and B through
19 +the parent relationship.
20 +
21 +Given a selection of equally good common ancestors it should not be
22 +relied on to decide in any particular way.
23
24 The "git-merge-base" algorithm is still in flux - use the source...
25
26 +OPTIONS
27 +-------
28 +--all::
29 + Output all common ancestors for the two commits instead of
30 + just one.
31
32 Author
33 ------