diff options
| author | Fredrik Kuivinen <freku045@student.liu.se> | 2006-05-16 07:58:15 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-15 23:19:46 -0700 |
| commit | 2aa839614e9d4f8b84803fb4ce633d6a0981675f (patch) | |
| tree | 74ad9150fd6f157ca6b3aec8924f2897f6e144b5 | |
| parent | 1b9bc5a7b7434d771726011613a00cb202bd9f44 (diff) | |
| download | git-2aa839614e9d4f8b84803fb4ce633d6a0981675f.tar.gz git-2aa839614e9d4f8b84803fb4ce633d6a0981675f.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-merge-base.txt | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt index d1d56f194..6099be2ad 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 ------ |