X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-show.txt;h=34c5caf2d08324cc1595013cbdcd40d89d7a1968;hb=d6b3e3a33f71910526ccf80af6c13a230363cd89;hp=98dea6125da78fa74800925b57dad2f002b1d6f6;hpb=5d7eeee2ac64e277e47ce2cdabd1af0d2501a96f;p=git.git diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt index 98dea6125..34c5caf2d 100644 --- a/Documentation/git-show.txt +++ b/Documentation/git-show.txt @@ -25,13 +25,21 @@ 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 +control how the changes the commit introduces are shown. + This manual page describes only the most frequently used options. OPTIONS ------- -:: - ID of the commit to show. +:: + The name of the object to show. + For a more complete list of ways to spell object names, see + "SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1]. + +include::pretty-options.txt[] + include::pretty-formats.txt[] @@ -40,24 +48,31 @@ 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 and -Junio C Hamano +Junio C Hamano . Significantly enhanced by +Johannes Schindelin . Documentation