diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-16 17:21:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-16 17:21:02 -0700 |
| commit | 5c87a8c5602eb09810679dd3e0bcfc7ae1fed111 (patch) | |
| tree | 361ea82efc61e4f3bcf7fb275f0b172f90bca606 | |
| parent | 0fa6417c4911e8d252e562d3f58e737d0fdd0228 (diff) | |
| parent | c82a22c39cbc32576f64f5c6b3f24b99ea8149c7 (diff) | |
| download | git-5c87a8c5602eb09810679dd3e0bcfc7ae1fed111.tar.gz git-5c87a8c5602eb09810679dd3e0bcfc7ae1fed111.tar.xz | |
Merge branch 'maint'
* maint:
merge-base: Clarify the comments on post processing.
Update the documentation for git-merge-base
| -rw-r--r-- | Documentation/git-merge-base.txt | 18 | ||||
| -rw-r--r-- | merge-base.c | 9 |
2 files changed, 20 insertions, 7 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 ------ diff --git a/merge-base.c b/merge-base.c index f0dc06ef5..4856ca01c 100644 --- a/merge-base.c +++ b/merge-base.c @@ -82,8 +82,9 @@ static struct commit *interesting(struct commit_list *list) * commit B. * * - * Another pathological example how this thing can fail to mark an ancestor - * of a merge base as UNINTERESTING without the postprocessing phase. + * Another pathological example how this thing used to fail to mark an + * ancestor of a merge base as UNINTERESTING before we introduced the + * postprocessing phase (mark_reachable_commits). * * 2 * H @@ -118,7 +119,9 @@ static struct commit *interesting(struct commit_list *list) * D7 2 3 7 7 3 2 1 2 * E7 2 3 7 7 7 2 1 2 * - * and we end up showing E as an interesting merge base. + * and we ended up showing E as an interesting merge base. + * The postprocessing phase re-injects C and continues traversal + * to contaminate D and E. */ static int show_all = 0; |