Merge branch 'jh/push-default-upstream-configname' into maint

diff --git a/cache.h b/cache.h
index 39ca875fb54afa8ef31631d6096738c46df02ccc..c782495a8f097e45c4bedd0e18c1f1250b794728 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -607,7 +607,7 @@ enum rebase_setup_type {
 enum push_default_type {
        PUSH_DEFAULT_NOTHING = 0,
        PUSH_DEFAULT_MATCHING,
-       PUSH_DEFAULT_TRACKING,
+       PUSH_DEFAULT_UPSTREAM,
        PUSH_DEFAULT_CURRENT
 };