From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Sep 2014 19:36:15 +0000 (-0700)
Subject: Merge branch 'jk/mbox-from-line'
X-Git-Tag: v2.2.0-rc0~72
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=26d058738963f23826d77017e82842331af0bae6;p=thirdparty%2Fgit.git

Merge branch 'jk/mbox-from-line'

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
---

26d058738963f23826d77017e82842331af0bae6