diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-03-28 13:52:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-28 13:52:29 -0700 |
| commit | 67476f59bc8469cb2563bdf72c5805c241ea1d2c (patch) | |
| tree | 875239f5424fc7d53d3990eb6d02510e636cb4b1 | |
| parent | 88fb4aa23a5840f46cb20e1c66420de9796da6a2 (diff) | |
| parent | e7e183d6ee07f9744f58f8e35fe336511df10563 (diff) | |
| download | git-67476f59bc8469cb2563bdf72c5805c241ea1d2c.tar.gz | |
Merge branch 'km/config-grammofix' into maint
Doc update.
* km/config-grammofix:
doc/config: grammar fixes for core.{editor,commentChar}
| -rw-r--r-- | Documentation/config.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 953cf69117..e43d147825 100644 --- 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 '#'). |