mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* jh/push-default-upstream-configname:
  push.default: Rename 'tracking' to 'upstream'
This commit is contained in:
Junio C Hamano
2011-03-16 16:47:26 -07:00
parent 7633a5ab9a 53c403116a
commit 61a6f1faec
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config.c
View File

@ -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 {