summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-16 23:47:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-16 23:47:26 (GMT)
commit61a6f1faecf19d7727bdfae012a14747c672cb1a (patch)
tree414004f8e28dfbd74f37ed161bc0dd491219b01e /config.c
parent7633a5ab9a33f90fc0fb912d7403f6c21c5435c1 (diff)
parent53c403116a947c538132fc721f83196036f7a299 (diff)
downloadgit-61a6f1faecf19d7727bdfae012a14747c672cb1a.zip
git-61a6f1faecf19d7727bdfae012a14747c672cb1a.tar.gz
git-61a6f1faecf19d7727bdfae012a14747c672cb1a.tar.bz2
Merge branch 'jh/push-default-upstream-configname' into maint
* jh/push-default-upstream-configname: push.default: Rename 'tracking' to 'upstream'
Diffstat (limited to 'config.c')
-rw-r--r--config.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/config.c b/config.c
index 3dd55d5..822ef83 100644
--- a/config.c
+++ b/config.c
@@ -729,8 +729,10 @@ static int git_default_push_config(const char *var, const char *value)
push_default = PUSH_DEFAULT_NOTHING;
else if (!strcmp(value, "matching"))
push_default = PUSH_DEFAULT_MATCHING;
- else if (!strcmp(value, "tracking"))
- push_default = PUSH_DEFAULT_TRACKING;
+ else if (!strcmp(value, "upstream"))
+ push_default = PUSH_DEFAULT_UPSTREAM;
+ else if (!strcmp(value, "tracking")) /* deprecated */
+ push_default = PUSH_DEFAULT_UPSTREAM;
else if (!strcmp(value, "current"))
push_default = PUSH_DEFAULT_CURRENT;
else {