diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-10-07 13:39:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-07 13:39:27 -0700 |
| commit | b6e8269e9ba131b6ea6a10088be139dc89704fb6 (patch) | |
| tree | e861fc22f5b98a596cfbe7e03124fc93b3a817ed /mergetools | |
| parent | 80b616d04b8f5a15b5d5587d67baf6e2e28c9f87 (diff) | |
| parent | 85de86a16bd853708658eb13689d913bc377ae3e (diff) | |
| download | git-b6e8269e9ba131b6ea6a10088be139dc89704fb6.tar.gz | |
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
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions