[PATCH v2] doc: use 'rev' instead of 'commit' for merge-base arguments

From: Takuya Noguchi <takninnovationresearch@gmail.com>

The notation <commit> can be misunderstandable only for commit SHA1, but merge-base accepts any commit references. Like rev-parse, the name of arguments should be <rev> instead of <commit>.

Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
---
    doc: use 'rev' instead of 'commit' for merge-base arguments
    
    The notation can be misunderstandable only for commit SHA1, but
    merge-base accepts any commit references. Like rev-parse, the name of
    arguments should be instead of .
    
    Changes since v1:
    
     * Use rev instead of ref, not commit-ish which is less used than rev
       through the document.
    
    Signed-off-by: Takuya Noguchi takninnovationresearch@gmail.com
    [takninnovationresearch@gmail.com]

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-719%2Ftnir%2Fmerge-base-supporting-refs-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-719/tnir/merge-base-supporting-refs-v2
Pull-Request: https://github.com/git/git/pull/719

Range-diff vs v1:

 1:  9c83cf1c620 ! 1:  6e2157da4b1 doc: use 'ref' instead of 'commit' for merge-base arguments
     @@ -1,10 +1,10 @@
      Author: Takuya Noguchi <takninnovationresearch@gmail.com>
      
     -    doc: use 'ref' instead of 'commit' for merge-base arguments
     +    doc: use 'rev' instead of 'commit' for merge-base arguments
      
          The notation <commit> can be misunderstandable only for commit SHA1,
     -    but merge-base accepts any commit references. Like reflog, the name of
     -    arguments should be <ref> instead of <commit>.
     +    but merge-base accepts any commit references. Like rev-parse, the name
     +    of arguments should be <rev> instead of <commit>.
      
          Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
      
     @@ -20,11 +20,11 @@
      -'git merge-base' --is-ancestor <commit> <commit>
      -'git merge-base' --independent <commit>...
      -'git merge-base' --fork-point <ref> [<commit>]
     -+'git merge-base' [-a|--all] <ref> <ref>...
     -+'git merge-base' [-a|--all] --octopus <ref>...
     -+'git merge-base' --is-ancestor <ref> <ref>
     -+'git merge-base' --independent <ref>...
     -+'git merge-base' --fork-point <ref> [<ref>]
     ++'git merge-base' [-a|--all] <rev> <rev>...
     ++'git merge-base' [-a|--all] --octopus <rev>...
     ++'git merge-base' --is-ancestor <rev> <rev>
     ++'git merge-base' --independent <rev>...
     ++'git merge-base' --fork-point <ref> [<rev>]
       
       DESCRIPTION
       -----------
     @@ -41,11 +41,11 @@
      -	N_("git merge-base --independent <commit>..."),
      -	N_("git merge-base --is-ancestor <commit> <commit>"),
      -	N_("git merge-base --fork-point <ref> [<commit>]"),
     -+	N_("git merge-base [-a | --all] <ref> <ref>..."),
     -+	N_("git merge-base [-a | --all] --octopus <ref>..."),
     -+	N_("git merge-base --independent <ref>..."),
     -+	N_("git merge-base --is-ancestor <ref> <ref>"),
     -+	N_("git merge-base --fork-point <ref1> [<ref2>]"),
     ++	N_("git merge-base [-a | --all] <rev> <rev>..."),
     ++	N_("git merge-base [-a | --all] --octopus <rev>..."),
     ++	N_("git merge-base --independent <rev>..."),
     ++	N_("git merge-base --is-ancestor <rev> <rev>"),
     ++	N_("git merge-base --fork-point <ref> [<rev>]"),
       	NULL
       };
       
     @@ -54,7 +54,7 @@
       			    N_("is the first one ancestor of the other?"), 'a'),
       		OPT_CMDMODE(0, "fork-point", &cmdmode,
      -			    N_("find where <commit> forked from reflog of <ref>"), 'f'),
     -+			    N_("find where <ref2> forked from reflog of <ref1>"), 'f'),
     ++			    N_("find where <rev> forked from reflog of <ref>"), 'f'),
       		OPT_END()
       	};
       

 Documentation/git-merge-base.txt | 10 +++++-----
 builtin/merge-base.c             | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)