diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-03-21 15:03:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-21 15:03:30 -0700 |
| commit | 71da2fb077c90d24f3d3b7597cea0393702ec467 (patch) | |
| tree | 06612b848c076a55271a2b85b9adbf94bd8d672d /xdiff/xmerge.c | |
| parent | Merge branch 'jk/t6300-cleanup' into maint (diff) | |
| parent | send-email: only allow one address per body tag (diff) | |
| download | tgif-71da2fb077c90d24f3d3b7597cea0393702ec467.tar.xz | |
Merge branch 'jh/send-email-one-cc' into maint
"Cc:" on the trailer part does not have to conform to RFC strictly,
unlike in the e-mail header. "git send-email" has been updated to
ignore anything after '>' when picking addresses, to allow non-address
cruft like " # stable 4.4" after the address.
* jh/send-email-one-cc:
send-email: only allow one address per body tag
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions