1
0
mirror of https://github.com/git/git.git synced 2024-10-22 12:28:32 +02:00

Merge branch 'km/config-grammofix'

Doc update.

* km/config-grammofix:
  doc/config: grammar fixes for core.{editor,commentChar}
This commit is contained in:
Junio C Hamano 2017-03-27 10:59:29 -07:00
commit 3d6586d100

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