summaryrefslogtreecommitdiff
path: root/environment.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-12-09 01:23:48 -0800
committerJunio C Hamano <gitster@pobox.com>2007-12-09 01:23:48 -0800
commit4eb39e9bcccc54eb23af8a7e2676c63e5bf32866 (patch)
treec6a62b68b86275d7db7bda65fa448c92feeba130 /environment.c
parent05e74f4111b5ce5995dd1145f83398fe40a318e0 (diff)
parentcf1b7869f0c571bbd4f72a4355d9aca558baa0da (diff)
downloadgit-4eb39e9bcccc54eb23af8a7e2676c63e5bf32866.tar.gz
Merge branch 'jc/spht'
* jc/spht: Use gitattributes to define per-path whitespace rule core.whitespace: documentation updates. builtin-apply: teach whitespace_rules builtin-apply: rename "whitespace" variables and fix styles core.whitespace: add test for diff whitespace error highlighting git-diff: complain about >=8 consecutive spaces in initial indent War on whitespace: first, a bit of retreat. Conflicts: cache.h config.c diff.c
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 1dab72ec15..f3e3d4138d 100644
--- a/environment.c
+++ b/environment.c
@@ -36,6 +36,7 @@ int pager_use_color = 1;
char *editor_program;
char *excludes_file;
int auto_crlf = 0; /* 1: both ways, -1: only when adding git objects */
+unsigned whitespace_rule_cfg = WS_DEFAULT_RULE;
/* This is set by setup_git_dir_gently() and/or git_default_config() */
char *git_work_tree_cfg;