Merge branch 'jc/custom-comment-char'

[git.git] / Documentation / config.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index d7ec507003312f731c869958ce3ed4644697806e..10225cfaf745524ddd01dd7957135bca1c435d91 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -534,6 +534,12 @@ core.editor::
        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
+       messages consider a line that begins with this character
+       commented, and removes them after the editor returns
+       (default '#').
+
 sequence.editor::
        Text editor used by `git rebase -i` for editing the rebase insn file.
        The value is meant to be interpreted by the shell when it is used.