diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-16 17:21:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-16 17:21:35 -0700 |
| commit | 8a24f2fae0a08d5832318b62cb279fd02f1bdf5a (patch) | |
| tree | 07a0d71cb9cc6356e633dbaac96a318624b2f500 /Documentation | |
| parent | Merge branch 'np/pack' into next (diff) | |
| parent | Remove old "git-grep.sh" remnants (diff) | |
| download | tgif-8a24f2fae0a08d5832318b62cb279fd02f1bdf5a.tar.xz | |
Merge branch 'master' into next
* master:
Remove old "git-grep.sh" remnants
merge-base: Clarify the comments on post processing.
Update the documentation for git-merge-base
Diffstat (limited to 'Documentation')
| -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 d1d56f194a..6099be2add 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 ------ |