aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-format-patch.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-03-11 13:48:07 -0700
committerJunio C Hamano <gitster@pobox.com>2009-03-11 13:48:07 -0700
commit5a5bd23486c5d8721f4654eadec75213d3dc074f (patch)
tree51a0d4bf4b3277c010fe623f55e32c5824994eef /Documentation/git-format-patch.txt
parent72e3c32bef0574ec6febc5e815b0467f892ef7e2 (diff)
parent30984ed2e92651962c6b8bdacf1f84da75d1da95 (diff)
downloadgit-5a5bd23486c5d8721f4654eadec75213d3dc074f.tar.gz
git-5a5bd23486c5d8721f4654eadec75213d3dc074f.tar.xz
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
Diffstat (limited to 'Documentation/git-format-patch.txt')
-rw-r--r--Documentation/git-format-patch.txt10
1 files changed, 9 insertions, 1 deletions
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index e7ae8cf10..c14e3ee39 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -127,10 +127,18 @@ include::diff-options.txt[]
which is the commit message and the patch itself in the
second part, with "Content-Disposition: inline".
---thread::
+--thread[=<style>]::
Add In-Reply-To and References headers to make the second and
subsequent mails appear as replies to the first. Also generates
the Message-Id header to reference.
++
+The optional <style> argument can be either `shallow` or `deep`.
+'Shallow' threading makes every mail a reply to the head of the
+series, where the head is chosen from the cover letter, the
+`\--in-reply-to`, and the first patch mail, in this order. 'Deep'
+threading makes every mail a reply to the previous one. If not
+specified, defaults to the 'format.thread' configuration, or `shallow`
+if that is not set.
--in-reply-to=Message-Id::
Make the first mail (or all the mails with --no-thread) appear as a