summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-16 05:38:26 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-16 05:38:26 (GMT)
commit1576f5f7b2addd648a41fb5cfbcd2e6d632b7461 (patch)
tree78ceb72b0ed306f99a6dcf4848c46fd69b4d824b /Documentation
parent2ce633b928f78224a37308f45810e76fefe8df56 (diff)
parent5d7eeee2ac64e277e47ce2cdabd1af0d2501a96f (diff)
downloadgit-1576f5f7b2addd648a41fb5cfbcd2e6d632b7461.zip
git-1576f5f7b2addd648a41fb5cfbcd2e6d632b7461.tar.gz
git-1576f5f7b2addd648a41fb5cfbcd2e6d632b7461.tar.bz2
Merge branch 'js/show'
* js/show: git-show: grok blobs, trees and tags, too
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-show.txt40
1 files changed, 33 insertions, 7 deletions
diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt
index 4c880a8..98dea61 100644
--- a/Documentation/git-show.txt
+++ b/Documentation/git-show.txt
@@ -3,20 +3,27 @@ git-show(1)
NAME
----
-git-show - Show one commit with difference it introduces
+git-show - Show various types of objects
SYNOPSIS
--------
-'git-show' <option>...
+'git-show' [options] <object>...
DESCRIPTION
-----------
-Shows commit log and textual diff for a single commit. The
-command internally invokes 'git-rev-list' piped to
-'git-diff-tree', and takes command line options for both of
-these commands. It also presents the merge commit in a special
-format as produced by 'git-diff-tree --cc'.
+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'.
+
+For tags, it shows the tag message and the referenced objects.
+
+For trees, it shows the names (equivalent to gitlink:git-ls-tree[1]
+with \--name-only).
+
+For plain blobs, it shows the plain contents.
This manual page describes only the most frequently used options.
@@ -28,6 +35,25 @@ OPTIONS
include::pretty-formats.txt[]
+
+EXAMPLES
+--------
+
+git show v1.0.0::
+ Shows the tag `v1.0.0`.
+
+git show v1.0.0^{tree}::
+ Shows the tree pointed to by the tag `v1.0.0`.
+
+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
+ Concatenates the contents of said Makefiles in the head
+ of the branch `master`.
+
Author
------
Written by Linus Torvalds <torvalds@osdl.org> and