зеркало из https://github.com/microsoft/git.git
Merge branch 'ah/format-patch-thread-doc'
Doc update. * ah/format-patch-thread-doc: format-patch: correct documentation of --thread without an argument
This commit is contained in:
Коммит
9e0d1aa495
|
@ -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
|
||||
|
|
|
@ -470,6 +470,11 @@ test_expect_success 'thread' '
|
|||
check_threading expect.thread --thread main
|
||||
'
|
||||
|
||||
test_expect_success '--thread overrides format.thread=deep' '
|
||||
test_config format.thread deep &&
|
||||
check_threading expect.thread --thread main
|
||||
'
|
||||
|
||||
cat >expect.in-reply-to <<EOF
|
||||
---
|
||||
Message-ID: <0>
|
||||
|
|
Загрузка…
Ссылка в новой задаче