summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-05-24 22:32:38 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-05-24 22:32:38 -0700
commit84138845c56306d1c455b89a6be7fbdc4f2ead04 (patch)
tree7ead45d4420c683fdb8270e760f5cf242548d6e9 /Documentation
parentMerge branch 'sp/reflog' into next (diff)
parentfetch-pack: give up after getting too many "ack continue" (diff)
downloadtgif-84138845c56306d1c455b89a6be7fbdc4f2ead04.tar.xz
Merge branch 'jc/fetchupload' into next
* jc/fetchupload: fetch-pack: give up after getting too many "ack continue" cat-file: document -p option Built git-upload-tar should be ignored. ls-remote: fix rsync:// to report HEAD
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-cat-file.txt9
1 files changed, 7 insertions, 2 deletions
diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt
index 504eb1b16a..5e9cbf875d 100644
--- a/Documentation/git-cat-file.txt
+++ b/Documentation/git-cat-file.txt
@@ -8,12 +8,12 @@ git-cat-file - Provide content or type information for repository objects
SYNOPSIS
--------
-'git-cat-file' [-t | -s | -e | <type>] <object>
+'git-cat-file' [-t | -s | -e | -p | <type>] <object>
DESCRIPTION
-----------
Provides content or type of objects in the repository. The type
-is required unless '-t' is used to find the object type,
+is required unless '-t' or '-p' is used to find the object type,
or '-s' is used to find the object size.
OPTIONS
@@ -33,6 +33,9 @@ OPTIONS
Suppress all output; instead exit with zero status if <object>
exists and is a valid object.
+-p::
+ Pretty-print the contents of <object> based on its type.
+
<type>::
Typically this matches the real type of <object> but asking
for a type that can trivially be dereferenced from the given
@@ -49,6 +52,8 @@ If '-s' is specified, the size of the <object> in bytes.
If '-e' is specified, no output.
+If '-p' is specified, the contents of <object> are pretty-printed.
+
Otherwise the raw (though uncompressed) contents of the <object> will
be returned.