Merge branch 'lt/core-optim'

diff --git a/environment.c b/environment.c
index 945574169b75ae1f0f0efad847d863104c1da3d1..55c252706317818db64af8ff3fbfde6cd23e3488 100644 (file)
--- a/environment.c
+++ b/environment.c
@@ -39,6 +39,7 @@ int auto_crlf = 0;    /* 1: both ways, -1: only when adding git objects */
 enum safe_crlf safe_crlf = SAFE_CRLF_WARN;
 unsigned whitespace_rule_cfg = WS_DEFAULT_RULE;
 enum branch_track git_branch_track = BRANCH_TRACK_REMOTE;
+enum rebase_setup_type autorebase = AUTOREBASE_NEVER;
 
 /* This is set by setup_git_dir_gently() and/or git_default_config() */
 char *git_work_tree_cfg;