From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 7 Oct 2014 20:39:24 +0000 (-0700)
Subject: Merge branch 'jk/mbox-from-line' into maint
X-Git-Tag: v2.1.3~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b6e8269e9ba131b6ea6a10088be139dc89704fb6;p=thirdparty%2Fgit.git

Merge branch 'jk/mbox-from-line' into maint

Some MUAs mangled a line in a message that begins with "From " to
">From " when writing to a mailbox file and feeding such an input to
"git am" used to lose such a line.

* jk/mbox-from-line:
  mailinfo: work around -Wstring-plus-int warning
  mailinfo: make ">From" in-body header check more robust
---

b6e8269e9ba131b6ea6a10088be139dc89704fb6