diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-21 13:57:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-21 13:57:50 -0700 |
| commit | c01cdde1862bc53182b000700462e1119528061e (patch) | |
| tree | 2aa59e6b6a71e21bf1ad234c6a747f33f355b473 /git-mergetool.sh | |
| parent | 2c0577f74b454e1f50ade0d318ee9b2374c7f35c (diff) | |
| parent | d54eaaa268eb79a51ac11bfa8bbfb456c0b1a1fa (diff) | |
| download | git-c01cdde1862bc53182b000700462e1119528061e.tar.gz | |
Merge branch 'jk/maint-send-email-compose'
* jk/maint-send-email-compose:
send-email: rfc2047-quote subject lines with non-ascii characters
send-email: specify content-type of --compose body
Conflicts:
t/t9001-send-email.sh
Due to 065096c (git-send-email.perl: Handle shell metacharacters in
$EDITOR properly, 2008-05-04) which is a backward incompatible change (but
it makes handling of EDITOR consistent with other parts of the system),
the test script t9001 had to be adjusted.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions