Merge branch 'jk/maint-send-email-compose'
commitc01cdde1862bc53182b000700462e1119528061e
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 May 2008 20:57:50 +0000 (21 13:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 May 2008 20:57:50 +0000 (21 13:57 -0700)
tree2aa59e6b6a71e21bf1ad234c6a747f33f355b473
parent2c0577f74b454e1f50ade0d318ee9b2374c7f35c
parentd54eaaa268eb79a51ac11bfa8bbfb456c0b1a1fa
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>
git-send-email.perl
t/t9001-send-email.sh