From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 29 Sep 2016 23:57:12 +0000 (-0700)
Subject: Merge branch 'jt/mailinfo-fold-in-body-headers'
X-Git-Tag: v2.11.0-rc0~102
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4cff50b3fb50940e57dc10769b2f92d5cec1a05a?hp=--cc

Merge branch 'jt/mailinfo-fold-in-body-headers'

When "git format-patch --stdout" output is placed as an in-body
header and it uses the RFC2822 header folding, "git am" failed to
put the header line back into a single logical line.  The
underlying "git mailinfo" was taught to handle this properly.

* jt/mailinfo-fold-in-body-headers:
mailinfo: handle in-body header continuations
mailinfo: make is_scissors_line take plain char *
mailinfo: separate in-body header processing
---

4cff50b3fb50940e57dc10769b2f92d5cec1a05a