Merge branch 'ab/doc-cat-file-e-still-shows-errors'
authorJunio C Hamano <gitster@pobox.com>
Tue, 23 Jan 2018 21:16:41 +0000 (13:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 23 Jan 2018 21:16:41 +0000 (13:16 -0800)
Doc update.

* ab/doc-cat-file-e-still-shows-errors:
  cat-file doc: document that -e will return some output


Trivial merge