diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-16 16:47:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-16 16:47:26 -0700 |
| commit | 61a6f1faecf19d7727bdfae012a14747c672cb1a (patch) | |
| tree | 414004f8e28dfbd74f37ed161bc0dd491219b01e /config.c | |
| parent | 7633a5ab9a33f90fc0fb912d7403f6c21c5435c1 (diff) | |
| parent | 53c403116a947c538132fc721f83196036f7a299 (diff) | |
| download | git-61a6f1faecf19d7727bdfae012a14747c672cb1a.tar.gz | |
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.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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 { |