summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-05-19 20:17:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-05-19 20:17:58 (GMT)
commit3b7d373ae2618690170f93bd19883915851de903 (patch)
treec95dbebc54fc60a920479b96836b3f35e245ae9f /Documentation
parent949d16795c55ae4712aaec847d55bd2d7d050c84 (diff)
parent3e370f9faf0a4e26d92ae09a26baa19330887903 (diff)
downloadgit-3b7d373ae2618690170f93bd19883915851de903.zip
git-3b7d373ae2618690170f93bd19883915851de903.tar.gz
git-3b7d373ae2618690170f93bd19883915851de903.tar.bz2
Merge branch 'kn/cat-file-literally'
Add the "--allow-unknown-type" option to "cat-file" to allow inspecting loose objects of an experimental or a broken type. * kn/cat-file-literally: t1006: add tests for git cat-file --allow-unknown-type cat-file: teach cat-file a '--allow-unknown-type' option cat-file: make the options mutually exclusive sha1_file: support reading from a loose object of unknown type
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-cat-file.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt
index f6a16f4..499ae7b 100644
--- a/Documentation/git-cat-file.txt
+++ b/Documentation/git-cat-file.txt
@@ -9,7 +9,7 @@ git-cat-file - Provide content or type and size information for repository objec
SYNOPSIS
--------
[verse]
-'git cat-file' (-t | -s | -e | -p | <type> | --textconv ) <object>
+'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv ) <object>
'git cat-file' (--batch | --batch-check) < <list-of-objects>
DESCRIPTION
@@ -69,6 +69,9 @@ OPTIONS
not be combined with any other options or arguments. See the
section `BATCH OUTPUT` below for details.
+--allow-unknown-type::
+ Allow -s or -t to query broken/corrupt objects of unknown type.
+
OUTPUT
------
If '-t' is specified, one of the <type>.