summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-03-27 17:59:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-03-27 17:59:29 (GMT)
commit3d6586d100b0e91d08fa192d7070646584c2f1db (patch)
tree2bb9a357f3598ead3cac645f615664d3a344a35a /Documentation
parentb43942b33360414cbdd43f428a2acfc9cd9b86ee (diff)
parente7e183d6ee07f9744f58f8e35fe336511df10563 (diff)
downloadgit-3d6586d100b0e91d08fa192d7070646584c2f1db.zip
git-3d6586d100b0e91d08fa192d7070646584c2f1db.tar.gz
git-3d6586d100b0e91d08fa192d7070646584c2f1db.tar.bz2
Merge branch 'km/config-grammofix'
Doc update. * km/config-grammofix: doc/config: grammar fixes for core.{editor,commentChar}
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0d8df5a..1df1965 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 '#').