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:
Junio C Hamano 2023-04-21 15:35:04 -07:00
Родитель 7ac228c994 f024913164
Коммит 9e0d1aa495
2 изменённых файлов: 6 добавлений и 2 удалений

Просмотреть файл

@ -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>