summaryrefslogtreecommitdiff
path: root/Documentation/git-show.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/git-show.txt')
-rw-r--r--Documentation/git-show.txt24
1 files changed, 12 insertions, 12 deletions
diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt
index 5a219ab577..0002bfb045 100644
--- a/Documentation/git-show.txt
+++ b/Documentation/git-show.txt
@@ -8,7 +8,7 @@ git-show - Show various types of objects
SYNOPSIS
--------
-'git-show' [options] <object>...
+'git show' [options] <object>...
DESCRIPTION
-----------
@@ -16,16 +16,16 @@ Shows one or more objects (blobs, trees, tags and commits).
For commits it shows the log message and textual diff. It also
presents the merge commit in a special format as produced by
-'git-diff-tree --cc'.
+'git diff-tree --cc'.
For tags, it shows the tag message and the referenced objects.
-For trees, it shows the names (equivalent to gitlink: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.
-The command takes options applicable to the gitlink: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.
@@ -33,10 +33,13 @@ This manual page describes only the most frequently used 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 gitlink:git-rev-parse[1].
+ "SPECIFYING REVISIONS" section in linkgit:gitrevisions[1].
+
+include::pretty-options.txt[]
+
include::pretty-formats.txt[]
@@ -68,7 +71,7 @@ include::i18n.txt[]
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>.
@@ -76,9 +79,6 @@ Documentation
-------------
Documentation by David Greaves, Petr Baudis and the git-list <git@vger.kernel.org>.
-This manual page is a stub. You can help the git documentation by expanding it.
-
GIT
---
-Part of the gitlink:git[7] suite
-
+Part of the linkgit:git[1] suite