summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-09-10 17:03:07 +0900
committerJunio C Hamano <gitster@pobox.com>2017-09-10 17:03:07 +0900
commit5e03ae4594358b3ab71cf98f18b4ccb18af99e6d (patch)
treec542b6167ca2c53399cad6ed52203225f4645cca
parent02a19e9a48fab8782760f133c2a0e8c764788f3c (diff)
parent4e36907fa3f8f6d45d54373a0e49638486117d10 (diff)
downloadgit-5e03ae4594358b3ab71cf98f18b4ccb18af99e6d.tar.gz
Merge branch 'jk/doc-the-this' into maint
Doc clean-up. * jk/doc-the-this: doc: fix typo in sendemail.identity
-rw-r--r--Documentation/config.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 478b9431e0..2271809d90 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2912,8 +2912,8 @@ sendemail.smtpsslcertpath::
sendemail.<identity>.*::
Identity-specific versions of the 'sendemail.*' parameters
- found below, taking precedence over those when the this
- identity is selected, through command-line or
+ found below, taking precedence over those when this
+ identity is selected, through either the command-line or
`sendemail.identity`.
sendemail.aliasesFile::