X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fgit-merge-base.txt;h=6099be2add74c2eb82ea5b1af844174a4dd896b5;hb=2662dbfa58a2d12d1ab3d240b643b9506f43523b;hp=e4692163ea96e8efc3b2a5042057e4ec789c0d75;hpb=0493a3fd5204a36bc961a8611770ddb9ec1ed8ed;p=git.git diff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt index e4692163..6099be2a 100644 --- a/Documentation/git-merge-base.txt +++ b/Documentation/git-merge-base.txt @@ -1,6 +1,5 @@ git-merge-base(1) ================= -v0.1, May 2005 NAME ---- @@ -9,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 ------