git-bundle.txt: Cleanup

diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt
index 98dea6125da78fa74800925b57dad2f002b1d6f6..0002bfb0455b38eecf6b29da6a2464058ba42c57 100644 (file)
--- 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,22 +16,30 @@ 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 'git diff-tree' command to
+control how the changes the commit introduces are shown.
+
 This manual page describes only the most frequently used options.
 
 
 OPTIONS
 -------
-<commitid>::
-       ID of the commit 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:gitrevisions[1].
+
+include::pretty-options.txt[]
+
 
 include::pretty-formats.txt[]
 
@@ -40,33 +48,37 @@ EXAMPLES
 --------
 
 git show v1.0.0::
-       Shows the tag `v1.0.0`.
+       Shows the tag `v1.0.0`, along with the object the tags
+       points at.
 
-git show v1.0.0^{tree}::
+git show v1.0.0^\{tree\}::
        Shows the tree pointed to by the tag `v1.0.0`.
 
-git show next~10:Documentation/README
+git show next~10:Documentation/README::
        Shows the contents of the file `Documentation/README` as
        they were current in the 10th last commit of the branch
        `next`.
 
-git show master:Makefile master:t/Makefile
+git show master:Makefile master:t/Makefile::
        Concatenates the contents of said Makefiles in the head
        of the branch `master`.
 
+Discussion
+----------
+
+include::i18n.txt[]
+
 Author
 ------
 Written by Linus Torvalds <torvalds@osdl.org> and
-Junio C Hamano <junkio@cox.net>
+Junio C Hamano <gitster@pobox.com>.  Significantly enhanced by
+Johannes Schindelin <Johannes.Schindelin@gmx.de>.
 
 
 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