Use gitattributes to define per-path whitespace rule

[git.git] / environment.c

diff --git a/environment.c b/environment.c
index 624dd9677ce0a6d8d23973683d62ce83f61f02fe..2fbbc8e430cb6cd331f6835e07ede7c1e7d2a45a 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -35,7 +35,7 @@ int pager_in_use;
 int pager_use_color = 1;
 char *editor_program;
 int auto_crlf = 0;     /* 1: both ways, -1: only when adding git objects */
-unsigned whitespace_rule = WS_DEFAULT_RULE;
+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;