aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-format-patch.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-04-21 15:35:04 -0700
committerJunio C Hamano <gitster@pobox.com>2023-04-21 15:35:05 -0700
commit9e0d1aa495bd26f4688b915ac5c3cb656c9f7174 (patch)
treea2f26c9484a50995738eb6c7d8b4a60b953abbcf /Documentation/git-format-patch.txt
parent7ac228c99451970bc1c31f32cbbd273311cd3a02 (diff)
parentf024913164ae6ec53bd97c0fb8481abb0fecd86d (diff)
downloadgit-9e0d1aa495bd26f4688b915ac5c3cb656c9f7174.tar.gz
Merge branch 'ah/format-patch-thread-doc'
Doc update. * ah/format-patch-thread-doc: format-patch: correct documentation of --thread without an argument
Diffstat (limited to 'Documentation/git-format-patch.txt')
-rw-r--r--Documentation/git-format-patch.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 508f3ae2c0..b1c13fb39a 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -173,8 +173,7 @@ series, where the head is chosen from the cover letter, the
threading makes every mail a reply to the previous one.
+
The default is `--no-thread`, unless the `format.thread` configuration
-is set. If `--thread` is specified without a style, it defaults to the
-style specified by `format.thread` if any, or else `shallow`.
+is set. `--thread` without an argument is equivalent to `--thread=shallow`.
+
Beware that the default for 'git send-email' is to thread emails
itself. If you want `git format-patch` to take care of threading, you