Merge branch 'js/refer-upstream'

diff --git a/cache.h b/cache.h
index 4b15042c08afb2ba34ca6d08ebc5ca9b196ab7c8..7d5c21e3f1e737504a7f4f8c76781b1552cb77e3 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -553,6 +553,7 @@ enum branch_track {
        BRANCH_TRACK_REMOTE,
        BRANCH_TRACK_ALWAYS,
        BRANCH_TRACK_EXPLICIT,
+       BRANCH_TRACK_OVERRIDE,
 };
 
 enum rebase_setup_type {