Skip to content

Commit

Permalink
Merge branch 'ab/doc-cat-file-e-still-shows-errors' into maint
Browse files Browse the repository at this point in the history
Doc update.

* ab/doc-cat-file-e-still-shows-errors:
  cat-file doc: document that -e will return some output
  • Loading branch information
gitster committed Feb 15, 2018
2 parents d4e528e + 9bd2ce5 commit c93150c
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions Documentation/git-cat-file.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.

Expand Down

0 comments on commit c93150c

Please sign in to comment.