diff options
| author | Alex Henrie <alexhenrie24@gmail.com> | 2023-04-02 22:07:24 -0600 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-04-03 09:59:20 -0700 |
| commit | f024913164ae6ec53bd97c0fb8481abb0fecd86d (patch) | |
| tree | ff40228ff2b2f84cd6d7afbd2372c5226558850c /Documentation/git-format-patch.txt | |
| parent | 140b9478dad5d19543c1cb4fd293ccec228f1240 (diff) | |
| download | git-f024913164ae6ec53bd97c0fb8481abb0fecd86d.tar.gz | |
format-patch: correct documentation of --thread without an argument
In Git, almost all command line flags unconditionally override the
corresponding config option.[1] Add a test to confirm that this is the
case for `git format-patch --thread`.
[1] https://lore.kernel.org/git/CAMMLpeS3+NUQa2oqpHKVo3yWQNVMgkEXrs4U5_ggvk31yQbezQ@mail.gmail.com/
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-format-patch.txt')
| -rw-r--r-- | Documentation/git-format-patch.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index dfcc7da4c2..ed299e077d 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 |