summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-06 18:36:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-06-06 18:36:10 (GMT)
commit1e2600dd6a2acf8d2e9c0923184ca2335b861138 (patch)
tree3cf920ef1d92e62eae2b5f7cac17f2045c63fd6c /Documentation
parent075652953772dbabd01d471a4c73200b0ab5d8a6 (diff)
parent84c9dc2c5a2d34351a06554af32501d4f99990e9 (diff)
downloadgit-1e2600dd6a2acf8d2e9c0923184ca2335b861138.zip
git-1e2600dd6a2acf8d2e9c0923184ca2335b861138.tar.gz
git-1e2600dd6a2acf8d2e9c0923184ca2335b861138.tar.bz2
Merge branch 'nd/status-auto-comment-char'
* nd/status-auto-comment-char: commit: allow core.commentChar=auto for character auto selection config: be strict on core.commentChar
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index a33c087..2e3c665 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -544,6 +544,9 @@ core.commentchar::
messages consider a line that begins with this character
commented, and removes them after the editor returns
(default '#').
++
+If set to "auto", `git-commit` would select a character that is not
+the beginning character of any line in existing commit messages.
sequence.editor::
Text editor used by `git rebase -i` for editing the rebase instruction file.