From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Jul 2016 20:38:11 +0000 (-0700)
Subject: Merge branch 'ew/mboxrd-format-am'
X-Git-Tag: v2.10.0-rc0~158
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e25a4ded8a47333a4c71a224927d6df87d7c295e;p=thirdparty%2Fgit.git

Merge branch 'ew/mboxrd-format-am'

Teach format-patch and mailsplit (hence "am") how a line that
happens to begin with "From " in the e-mail message is quoted with
">", so that these lines can be restored to their original shape.

* ew/mboxrd-format-am:
  am: support --patch-format=mboxrd
  mailsplit: support unescaping mboxrd messages
  pretty: support "mboxrd" output format
---

e25a4ded8a47333a4c71a224927d6df87d7c295e