From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 21 Apr 2023 22:35:04 +0000 (-0700)
Subject: Merge branch 'ah/format-patch-thread-doc'
X-Git-Tag: v2.41.0-rc0~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e0d1aa495bd26f4688b915ac5c3cb656c9f7174;p=thirdparty%2Fgit.git

Merge branch 'ah/format-patch-thread-doc'

Doc update.

* ah/format-patch-thread-doc:
  format-patch: correct documentation of --thread without an argument
---

9e0d1aa495bd26f4688b915ac5c3cb656c9f7174
diff --cc t/t4014-format-patch.sh
index 7f1d4e8d58,b27a72f78a..3cf2b7a7fb
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@@ -470,9 -470,14 +470,14 @@@ 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>
 +Message-ID: <0>
  In-Reply-To: <1>
  References: <1>
  ---