summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-06-27 14:29:57 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-27 14:29:57 -0700
commitb29dc5c671150ff0c4afa41cdd8fec9c86ffe6eb (patch)
tree7a63fd518c80fbc2114a405d61293fff7eb4d9ad /builtin/merge.c
parentMerge branch 'jk/pull-into-dirty-unborn' (diff)
parentsend-email: sanitize author when writing From line (diff)
downloadtgif-b29dc5c671150ff0c4afa41cdd8fec9c86ffe6eb.tar.xz
Merge branch 'mt/send-email-cc-match-fix'
Logic used by git-send-email to suppress cc mishandled names that need RFC2047 quoting. * mt/send-email-cc-match-fix: send-email: sanitize author when writing From line send-email: add test for duplicate utf8 name
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions