]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1e4bf90 d9925d1)
Merge branch 'ew/mboxrd-format-am'
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:38:11 +0000 (13:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:38:11 +0000 (13:38 -0700)
commite25a4ded8a47333a4c71a224927d6df87d7c295e
tree7a0801d3ea9453ee23101f187e1ef9bf65b2ac48tree | snapshot
parent1e4bf907890e094f1c1c8c5086387e7d5fdb0655commit | diff
parentd9925d1a714a440f4063f64e1bd776194d2dd918commit | diff
Merge branch 'ew/mboxrd-format-am'

Teach format-patch and mailsplit (hence "am") how a line that
happens to begin with "From " in the e-mail message is quoted with
">", so that these lines can be restored to their original shape.

* ew/mboxrd-format-am:
  am: support --patch-format=mboxrd
  mailsplit: support unescaping mboxrd messages
  pretty: support "mboxrd" output format
builtin/log.c diff1 | diff2 | blob | history
pretty.c diff1 | diff2 | blob | history
t/t4014-format-patch.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.