diff options
| author |  Eric Wong <e@80x24.org> | 2016-06-05 04:46:41 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-06-06 11:40:15 -0700 |
| commit | d9925d1a714a440f4063f64e1bd776194d2dd918 (patch) | |
| tree | 9fa4ce3c6e7ece9ce5212e7e62820be0eb35973b /builtin/merge-ours.c | |
| parent | mailsplit: support unescaping mboxrd messages (diff) | |
| download | tgif-d9925d1a714a440f4063f64e1bd776194d2dd918.tar.xz | |
am: support --patch-format=mboxrd
Combined with "git format-patch --pretty=mboxrd", this should
allow us to round-trip commit messages with embedded mbox
"From " lines without corruption.
Signed-off-by: Eric Wong <e@80x24.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions