summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-02-28 05:58:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-02-28 05:58:31 (GMT)
commit8978166e531e0941811099d4117574ebbbcf35d8 (patch)
tree97c222b3705ea1980557ae1f96dda1d272625a83 /config.c
parentfbfeeaf29480a3299fa6c3349b7a8c1b147c18c5 (diff)
parent53c403116a947c538132fc721f83196036f7a299 (diff)
downloadgit-8978166e531e0941811099d4117574ebbbcf35d8.zip
git-8978166e531e0941811099d4117574ebbbcf35d8.tar.gz
git-8978166e531e0941811099d4117574ebbbcf35d8.tar.bz2
Merge branch 'jh/push-default-upstream-configname'
* 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 d5bb862..31f778b 100644
--- a/config.c
+++ b/config.c
@@ -737,8 +737,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 {