Merge branch 'jt/format-patch'

* jt/format-patch:
builtin-log: typefix for recent format-patch changes.
Add option to set initial In-Reply-To/References
Add option to enable threading headers
git-format-patch: Make the second and subsequent mails replies to the first

diff --combined log-tree.c
index 3a6c84dab559cc0904ba6c339fdb97edba7e7983,497198841736d11c178b0806747de5e70f20b588..b67b8dd17af9643e00152d9bd768dca89e08b4ce
--- 1/log-tree.c
--- 2/log-tree.c
+++ b/log-tree.c
@@@ -97,6 -97,11 +97,11 @@@ void show_log(struct rev_info *opt, con
                        subject = "Subject: ";
  
                printf("From %s Mon Sep 17 00:00:00 2001\n", sha1);
+               if (opt->message_id)
+                       printf("Message-Id: <%s>\n", opt->message_id);
+               if (opt->ref_message_id)
+                       printf("In-Reply-To: <%s>\nReferences: <%s>\n",
+                              opt->ref_message_id, opt->ref_message_id);
                if (opt->mime_boundary) {
                        static char subject_buffer[1024];
                        static char buffer[1024];
@@@ -129,8 -134,7 +134,8 @@@
                        opt->diffopt.stat_sep = buffer;
                }
        } else {
 -              printf("%s%s",
 +              printf("%s%s%s",
 +                     diff_get_color(opt->diffopt.color_diff, DIFF_COMMIT),
                       opt->commit_format == CMIT_FMT_ONELINE ? "" : "commit ",
                       diff_unique_abbrev(commit->object.sha1, abbrev_commit));
                if (opt->parents)
@@@ -139,8 -143,6 +144,8 @@@
                        printf(" (from %s)",
                               diff_unique_abbrev(parent->object.sha1,
                                                  abbrev_commit));
 +              printf("%s",
 +                     diff_get_color(opt->diffopt.color_diff, DIFF_RESET));
                putchar(opt->commit_format == CMIT_FMT_ONELINE ? ' ' : '\n');
        }