Merge branch 'lt/core-optim'

diff --git a/cache.h b/cache.h
index 0d9d9e25770cd18cf83b810dc29ec10163aa1620..9cee9a5f3fb2e51f617dcf9f92defcd596b97c10 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -441,7 +441,15 @@ enum branch_track {
        BRANCH_TRACK_EXPLICIT,
 };
 
+enum rebase_setup_type {
+       AUTOREBASE_NEVER = 0,
+       AUTOREBASE_LOCAL,
+       AUTOREBASE_REMOTE,
+       AUTOREBASE_ALWAYS,
+};
+
 extern enum branch_track git_branch_track;
+extern enum rebase_setup_type autorebase;
 
 #define GIT_REPO_VERSION 0
 extern int repository_format_version;