Merge branch 'km/config-grammofix' into maint

gitster · gitster · commit 67476f59bc84 · 2017-03-28T13:52:29.000-07:00
Doc update.

* km/config-grammofix:
  doc/config: grammar fixes for core.{editor,commentChar}
diff --git a/Documentation/config.txt b/Documentation/config.txt
@@ -668,13 +668,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 '#').
