Merge branch 'maint'

[git.git] / Documentation / git-name-rev.txt

diff --git a/Documentation/git-name-rev.txt b/Documentation/git-name-rev.txt
index b2d40a7e70d3bbc68edb2676746fbf83b8a67de0..7ca8a7b48cea191b58db93581f02fa4ff265acdc 100644 (file)
--- a/Documentation/git-name-rev.txt
+++ b/Documentation/git-name-rev.txt
@@ -15,7 +15,7 @@ SYNOPSIS
 DESCRIPTION
 -----------
 Finds symbolic names suitable for human digestion for revisions given in any
 DESCRIPTION
 -----------
 Finds symbolic names suitable for human digestion for revisions given in any

-format parsable by git-rev-parse.
+format parsable by 'git-rev-parse'.

 
 
 OPTIONS
 
 
 OPTIONS


@@ -38,8 +38,7 @@ OPTIONS
        Instead of printing both the SHA-1 and the name, print only
        the name.  If given with --tags the usual tag prefix of
        "tags/" is also omitted from the name, matching the output
        Instead of printing both the SHA-1 and the name, print only
        the name.  If given with --tags the usual tag prefix of
        "tags/" is also omitted from the name, matching the output

-       of linkgit:git-describe[1] more closely.  This option
-       cannot be combined with --stdin.
+       of `git-describe` more closely.

 
 --no-undefined::
        Die with error code != 0 when a reference is undefined,
 
 --no-undefined::
        Die with error code != 0 when a reference is undefined,


@@ -56,11 +55,11 @@ wrote you about that fantastic commit 33db5f4d9027a10e477ccf054b2c1ab94f74c85a.
 Of course, you look into the commit, but that only tells you what happened, but
 not the context.
 
 Of course, you look into the commit, but that only tells you what happened, but
 not the context.
 

-Enter git-name-rev:
+Enter 'git-name-rev':

 
 ------------
 % git name-rev 33db5f4d9027a10e477ccf054b2c1ab94f74c85a
 
 ------------
 % git name-rev 33db5f4d9027a10e477ccf054b2c1ab94f74c85a

-33db5f4d9027a10e477ccf054b2c1ab94f74c85a tags/v0.99^0~940
+33db5f4d9027a10e477ccf054b2c1ab94f74c85a tags/v0.99~940

 ------------
 
 Now you are wiser, because you know that it happened 940 revisions before v0.99.
 ------------
 
 Now you are wiser, because you know that it happened 940 revisions before v0.99.