diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-17 00:21:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-17 00:21:02 (GMT) |
| commit | 5c87a8c5602eb09810679dd3e0bcfc7ae1fed111 (patch) | |
| tree | 361ea82efc61e4f3bcf7fb275f0b172f90bca606 /Documentation | |
| parent | 0fa6417c4911e8d252e562d3f58e737d0fdd0228 (diff) | |
| parent | c82a22c39cbc32576f64f5c6b3f24b99ea8149c7 (diff) | |
| download | git-5c87a8c5602eb09810679dd3e0bcfc7ae1fed111.zip git-5c87a8c5602eb09810679dd3e0bcfc7ae1fed111.tar.gz git-5c87a8c5602eb09810679dd3e0bcfc7ae1fed111.tar.bz2 | |
Merge branch 'maint'
* maint:
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 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 ------ |