summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2016-06-05 04:46:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-06-06 18:40:15 (GMT)
commitd9925d1a714a440f4063f64e1bd776194d2dd918 (patch)
tree9fa4ce3c6e7ece9ce5212e7e62820be0eb35973b /ll-merge.c
parentc88098d7f19c6322fbd911bb89e2efd246bf75c4 (diff)
downloadgit-d9925d1a714a440f4063f64e1bd776194d2dd918.zip
git-d9925d1a714a440f4063f64e1bd776194d2dd918.tar.gz
git-d9925d1a714a440f4063f64e1bd776194d2dd918.tar.bz2
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 'll-merge.c')
0 files changed, 0 insertions, 0 deletions