summaryrefslogtreecommitdiff
path: root/git-rebase--merge.sh
diff options
context:
space:
mode:
authorLibravatar Eric Wong <e@80x24.org>2016-06-05 04:46:39 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-06-06 11:14:14 -0700
commit9f23e040615857e3909db51a5420f338c9831b5a (patch)
tree65aab42cd4b6eee9f84382de80f871ff3c3973d1 /git-rebase--merge.sh
parentAlmost ready for 2.9-rc2 (diff)
downloadtgif-9f23e040615857e3909db51a5420f338c9831b5a.tar.xz
pretty: support "mboxrd" output format
This output format prevents format-patch output from breaking readers if somebody copy+pasted an mbox into a commit message. Unlike the traditional "mboxo" format, "mboxrd" is designed to be fully-reversible. "mboxrd" also gracefully degrades to showing extra ">" in existing "mboxo" readers. This degradation is preferable to breaking message splitting completely, a problem I've seen in "mboxcl" due to having multiple, non-existent, or inaccurate Content-Length headers. "mboxcl2" is a non-starter since it's inherits the problems of "mboxcl" while being completely incompatible with existing tooling based around mailsplit. ref: http://homepage.ntlworld.com/jonathan.deboynepollard/FGA/mail-mbox-formats.html Signed-off-by: Eric Wong <e@80x24.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--merge.sh')
0 files changed, 0 insertions, 0 deletions