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

3
Documentation/config.txt
View File

@ -1582,7 +1582,8 @@ push.default::
* `matching` - push all matching branches.
All branches having the same name in both ends are considered to be
matching. This is the default.
* `tracking` - push the current branch to its upstream branch.
* `upstream` - push the current branch to its upstream branch.
* `tracking` - deprecated synonym for `upstream`.
* `current` - push the current branch to a branch of the same name.
rebase.stat::