summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-08-24 10:20:03 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-08-24 10:20:04 -0700
commit16e842bcf5fe8fa409c50f58e03e261938ba1ef9 (patch)
tree5a57b8b04ef5deb8345bb91b99ca3fd2cfdd1ac6 /Documentation
parentMerge branch 'rs/commit-h-single-parent-cleanup' (diff)
parentdoc: fix typo in sendemail.identity (diff)
downloadtgif-16e842bcf5fe8fa409c50f58e03e261938ba1ef9.tar.xz
Merge branch 'jk/doc-the-this'
Doc clean-up. * jk/doc-the-this: doc: fix typo in sendemail.identity
Diffstat (limited to 'Documentation')
-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::