Merge branch 'master' into cc/help

[git.git] / environment.c

diff --git a/environment.c b/environment.c
index b5a6c69f7c1d214daa2556d04dd35e0976fc6e5e..f3e3d4138d463520dbe6d709dfbe0803b619456d 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -34,7 +34,9 @@ char *pager_program;
 int pager_in_use;
 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;