summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-08-24 17:20:03 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-08-24 17:20:04 (GMT)
commit16e842bcf5fe8fa409c50f58e03e261938ba1ef9 (patch)
tree5a57b8b04ef5deb8345bb91b99ca3fd2cfdd1ac6 /Documentation/config.txt
parent985b2cfc7b71cdaf842832afe3914e25a80dde25 (diff)
parent4e36907fa3f8f6d45d54373a0e49638486117d10 (diff)
downloadgit-16e842bcf5fe8fa409c50f58e03e261938ba1ef9.zip
git-16e842bcf5fe8fa409c50f58e03e261938ba1ef9.tar.gz
git-16e842bcf5fe8fa409c50f58e03e261938ba1ef9.tar.bz2
Merge branch 'jk/doc-the-this'
Doc clean-up. * jk/doc-the-this: doc: fix typo in sendemail.identity
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 478b943..2271809 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::