From 2aa839614e9d4f8b84803fb4ce633d6a0981675f Mon Sep 17 00:00:00 2001 From: Fredrik Kuivinen Date: Tue, 16 May 2006 07:58:15 +0200 Subject: [PATCH] Update the documentation for git-merge-base Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano --- Documentation/git-merge-base.txt | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt index d1d56f19..6099be2a 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' +'git-merge-base' [--all] 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 ------ -- 2.11.0