Browse Source

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
maint
Junio C Hamano 7 years ago
parent
commit
c93150cfb0
  1. 7
      Documentation/git-cat-file.txt

7
Documentation/git-cat-file.txt

@ -42,8 +42,9 @@ OPTIONS @@ -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>. @@ -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.


Loading…
Cancel
Save