Merge branch 'tr/maint-1.6.0-send-email-irt' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 22 Mar 2009 06:09:21 +0000 (23:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 22 Mar 2009 06:09:21 +0000 (23:09 -0700)
commit923cc82c481a99269d397dc86f8b664ba8cb98da
tree4fbd4c8d180bf95f21722aa77de0e4f350cefe26
parent8af95ca0174f05344e36d05b61844c8af4764b92
parentaaab4b9fb97c1f638d02be7b8c432a4d57f37c56
Merge branch 'tr/maint-1.6.0-send-email-irt' into maint

* tr/maint-1.6.0-send-email-irt:
  send-email: test --no-thread --in-reply-to combination
  send-email: respect in-reply-to regardless of threading

Conflicts:
t/t9001-send-email.sh
git-send-email.perl
t/t9001-send-email.sh