Merge branch 'mh/maint-fix-send-email-threaded' into mh/fix-send-email-threaded
commit95a877a34c3838a92a99794ebc3b082f6f525899
authorJunio C Hamano <gitster@pobox.com>
Fri, 12 Jun 2009 16:23:43 +0000 (12 09:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 12 Jun 2009 16:23:43 +0000 (12 09:23 -0700)
treebcd7961c64ef7d319e75b7dc320235881efd1e69
parenta1b5b371994beb044053da22ec4a9607630a83a2
parent0fd41f2d66fdb7c8125f341c72f075aca045017f
Merge branch 'mh/maint-fix-send-email-threaded' into mh/fix-send-email-threaded

* mh/maint-fix-send-email-threaded:
  doc/send-email: clarify the behavior of --in-reply-to with --no-thread
  send-email: fix non-threaded mails
  add a test for git-send-email for non-threaded mails

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