From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Mar 2017 17:59:29 +0000 (-0700)
Subject: Merge branch 'km/config-grammofix'
X-Git-Tag: v2.13.0-rc0~62
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3d6586d100b0e91d08fa192d7070646584c2f1db?hp=b43942b33360414cbdd43f428a2acfc9cd9b86ee

Merge branch 'km/config-grammofix'

Doc update.

* km/config-grammofix:
doc/config: grammar fixes for core.{editor,commentChar}
---

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0d8df5a9f9..1df1965457 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -737,13 +737,13 @@ alternative to having an `init.templateDir` where you've changed
 default hooks.
 
 core.editor::
-	Commands such as `commit` and `tag` that lets you edit
-	messages by launching an editor uses the value of this
+	Commands such as `commit` and `tag` that let you edit
+	messages by launching an editor use the value of this
 	variable when it is set, and the environment variable
 	`GIT_EDITOR` is not set.  See linkgit:git-var[1].
 
 core.commentChar::
-	Commands such as `commit` and `tag` that lets you edit
+	Commands such as `commit` and `tag` that let you edit
 	messages consider a line that begins with this character
 	commented, and removes them after the editor returns
 	(default '#').