Merge branch 'ab/doc-cat-file-e-still-shows-errors'

Doc update.

* ab/doc-cat-file-e-still-shows-errors:
  cat-file doc: document that -e will return some output
This commit is contained in:
Junio C Hamano 2018-01-23 13:16:41 -08:00
commit 93a622f4a7

View File

@ -42,8 +42,9 @@ OPTIONS
<object>. <object>.
-e:: -e::
Suppress all output; instead exit with zero status if <object> Exit with zero status if <object> exists and is a valid
exists and is a valid object. object. If <object> is of an invalid format exit with non-zero and
emits an error on stderr.
-p:: -p::
Pretty-print the contents of <object> based on its type. 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 `-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. If `-p` is specified, the contents of <object> are pretty-printed.