diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-15 15:18:15 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-15 15:18:15 -0800 |
| commit | c93150cfb02257b38d0f8abcafc7de5908afbb3b (patch) | |
| tree | 6e25351f5b4cb6945ce2feb4938d8ea2965114cc | |
| parent | d4e528ef6a00b2176e69e426be0da19c86577ffc (diff) | |
| parent | 9bd2ce543298c9b2f1a6d1bb8ffef18295ccfec7 (diff) | |
| download | git-c93150cfb02257b38d0f8abcafc7de5908afbb3b.tar.gz | |
Merge branch 'ab/doc-cat-file-e-still-shows-errors' into maint
Doc update.
* ab/doc-cat-file-e-still-shows-errors:
cat-file doc: document that -e will return some output
| -rw-r--r-- | Documentation/git-cat-file.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt index fb09cd69d6..f90f09b03f 100644 --- a/Documentation/git-cat-file.txt +++ b/Documentation/git-cat-file.txt @@ -42,8 +42,9 @@ OPTIONS <object>. -e:: - Suppress all output; instead exit with zero status if <object> - exists and is a valid object. + Exit with zero status if <object> exists and is a valid + object. If <object> is of an invalid format exit with non-zero and + emits an error on stderr. -p:: Pretty-print the contents of <object> based on its type. @@ -168,7 +169,7 @@ If `-t` is specified, one of the <type>. If `-s` is specified, the size of the <object> in bytes. -If `-e` is specified, no output. +If `-e` is specified, no output, unless the <object> is malformed. If `-p` is specified, the contents of <object> are pretty-printed. |