Merge branch 'tr/format-patch-thread'

* tr/format-patch-thread:
  format-patch: support deep threading
  format-patch: thread as reply to cover letter even with in-reply-to
  format-patch: track several references
  format-patch: threading test reactivation

Conflicts:
	builtin-log.c

diff --cc Documentation/git-format-patch.txt
Simple merge

diff --cc builtin-log.c
index 8549028817ac1a4add0a224ac2996bcbea9a6455,6bf04e8afe24c242704465c31b3a979306be176b..8684fcdb67fc0216ffc860f60f5c060f10907b83
--- 1/builtin-log.c
--- 2/builtin-log.c
+++ b/builtin-log.c
@@@ -490,14 -493,18 +495,25 @@@ static int git_format_config(const cha
                auto_number = auto_number && numbered;
                return 0;
        }
- 
 +      if (!strcmp(var, "format.attach")) {
 +              if (value && *value)
 +                      default_attach = xstrdup(value);
 +              else
 +                      default_attach = xstrdup(git_version_string);
 +              return 0;
 +      }
+       if (!strcmp(var, "format.thread")) {
+               if (value && !strcasecmp(value, "deep")) {
+                       thread = THREAD_DEEP;
+                       return 0;
+               }
+               if (value && !strcasecmp(value, "shallow")) {
+                       thread = THREAD_SHALLOW;
+                       return 0;
+               }
+               thread = git_config_bool(var, value) && THREAD_SHALLOW;
+               return 0;
+       }
  
        return git_log_config(var, value, cb);
  }

diff --cc log-tree.c
Simple merge