X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=environment.c;h=18a1c4eec49bfddcb81d6669c83f8f97a218d7bf;hb=928323af6b761e8b1c33ce98e67c2f56fd1b7997;hp=b5a6c69f7c1d214daa2556d04dd35e0976fc6e5e;hpb=63f328290a0edda617c0881a356c07280fbba459;p=git.git diff --git a/environment.c b/environment.c index b5a6c69f7..18a1c4eec 100644 --- a/environment.c +++ b/environment.c @@ -31,10 +31,11 @@ size_t packed_git_window_size = DEFAULT_PACKED_GIT_WINDOW_SIZE; size_t packed_git_limit = DEFAULT_PACKED_GIT_LIMIT; size_t delta_base_cache_limit = 16 * 1024 * 1024; 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;