Merge branch 'ab/doc-cat-file-e-still-shows-errors' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Feb 2018 23:18:15 +0000 (15:18 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Feb 2018 23:18:15 +0000 (15:18 -0800)
commitc93150cfb02257b38d0f8abcafc7de5908afbb3b
tree6e25351f5b4cb6945ce2feb4938d8ea2965114cc
parentd4e528ef6a00b2176e69e426be0da19c86577ffc
parent9bd2ce543298c9b2f1a6d1bb8ffef18295ccfec7
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