summaryrefslogtreecommitdiff
path: root/environment.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-06 11:36:10 -0700
committerJunio C Hamano <gitster@pobox.com>2014-06-06 11:36:10 -0700
commit1e2600dd6a2acf8d2e9c0923184ca2335b861138 (patch)
tree3cf920ef1d92e62eae2b5f7cac17f2045c63fd6c /environment.c
parent075652953772dbabd01d471a4c73200b0ab5d8a6 (diff)
parent84c9dc2c5a2d34351a06554af32501d4f99990e9 (diff)
downloadgit-1e2600dd6a2acf8d2e9c0923184ca2335b861138.tar.gz
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 'environment.c')
-rw-r--r--environment.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/environment.c b/environment.c
index 37354c8d05..c648ac3d3a 100644
--- a/environment.c
+++ b/environment.c
@@ -69,6 +69,7 @@ unsigned long pack_size_limit_cfg;
* that is subject to stripspace.
*/
char comment_line_char = '#';
+int auto_comment_line_char;
/* Parallel index stat data preload? */
int core_preload_index = 0;