Merge branch 'maint'

[git.git] / Documentation / git-show.txt

diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt
index 29ed0acc62156a743db2741d1f576fca87eebff1..48b612e2ae50c319bcef567c7619f60396dd8408 100644 (file)
--- a/Documentation/git-show.txt
+++ b/Documentation/git-show.txt
@@ -8,7 +8,7 @@ git-show - Show various types of objects
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git-show' [options] <object>...
+'git show' [options] <object>...

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -20,12 +20,12 @@ presents the merge commit in a special format as produced by
 
 For tags, it shows the tag message and the referenced objects.
 
 
 For tags, it shows the tag message and the referenced objects.
 

-For trees, it shows the names (equivalent to linkgit:git-ls-tree[1]
+For trees, it shows the names (equivalent to 'git-ls-tree'

 with \--name-only).
 
 For plain blobs, it shows the plain contents.
 
 with \--name-only).
 
 For plain blobs, it shows the plain contents.
 

-The command takes options applicable to the linkgit:git-diff-tree[1] command to
+The command takes options applicable to the 'git-diff-tree' command to

 control how the changes the commit introduces are shown.
 
 This manual page describes only the most frequently used options.
 control how the changes the commit introduces are shown.
 
 This manual page describes only the most frequently used options.


@@ -33,8 +33,8 @@ This manual page describes only the most frequently used options.
 
 OPTIONS
 -------
 
 OPTIONS
 -------

-<object>::
-       The name of the object to show.
+<object>...::
+       The names of objects to show.

        For a more complete list of ways to spell object names, see
        "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
 
        For a more complete list of ways to spell object names, see
        "SPECIFYING REVISIONS" section in linkgit:git-rev-parse[1].
 


@@ -71,7 +71,7 @@ include::i18n.txt[]
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org> and
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org> and

-Junio C Hamano <junkio@cox.net>.  Significantly enhanced by
+Junio C Hamano <gitster@pobox.com>.  Significantly enhanced by

 Johannes Schindelin <Johannes.Schindelin@gmx.de>.
 
 
 Johannes Schindelin <Johannes.Schindelin@gmx.de>.
 
 


@@ -81,4 +81,4 @@ Documentation by David Greaves, Petr Baudis and the git-list <git@vger.kernel.or
 
 GIT
 ---
 
 GIT
 ---

-Part of the linkgit:git[7] suite
+Part of the linkgit:git[1] suite