summaryrefslogtreecommitdiffstats
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-06 20:36:10 +0200
committerJunio C Hamano <gitster@pobox.com>2014-06-06 20:36:10 +0200
commit1e2600dd6a2acf8d2e9c0923184ca2335b861138 (patch)
tree3cf920ef1d92e62eae2b5f7cac17f2045c63fd6c /cache.h
parentMerge branch 'mt/rebase-i-keep-empty-test' (diff)
parentcommit: allow core.commentChar=auto for character auto selection (diff)
downloadgit-1e2600dd6a2acf8d2e9c0923184ca2335b861138.tar.xz
git-1e2600dd6a2acf8d2e9c0923184ca2335b861138.zip
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 'cache.h')
-rw-r--r--cache.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index 8c6cdc29de..1e4b4f06e1 100644
--- a/cache.h
+++ b/cache.h
@@ -618,6 +618,7 @@ extern int precomposed_unicode;
* that is subject to stripspace.
*/
extern char comment_line_char;
+extern int auto_comment_line_char;
enum branch_track {
BRANCH_TRACK_UNSPECIFIED = -1,