X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-merge-base.txt;h=1a7ecbf8f39381b0c7b2da513dfa26eacec15cf6;hb=996869601594ffefb67238175055922340ced6f8;hp=07f78b4ae090a8d3d4b717dc64e84d6067218e5f;hpb=f4198c9b7d319a7a595f0d759e7d8094387ab77b;p=git.git diff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt index 07f78b4ae..1a7ecbf8f 100644 --- a/Documentation/git-merge-base.txt +++ b/Documentation/git-merge-base.txt @@ -8,20 +8,20 @@ git-merge-base - Find as good common ancestors as possible for a merge SYNOPSIS -------- -'git-merge-base' [--all] +'git merge-base' [--all] DESCRIPTION ----------- -"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 +'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... +The 'git-merge-base' algorithm is still in flux - use the source... OPTIONS ------- @@ -39,4 +39,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list