tree 6e25351f5b4cb6945ce2feb4938d8ea2965114cc
parent d4e528ef6a00b2176e69e426be0da19c86577ffc
parent 9bd2ce543298c9b2f1a6d1bb8ffef18295ccfec7
author Junio C Hamano <gitster@pobox.com> 1518736695 -0800
committer Junio C Hamano <gitster@pobox.com> 1518736695 -0800

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