diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-17 02:47:26 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-17 02:47:26 +0300 |
| commit | 61a6f1faecf19d7727bdfae012a14747c672cb1a (patch) | |
| tree | 414004f8e28dfbd74f37ed161bc0dd491219b01e /Documentation/config.txt | |
| parent | 7633a5ab9a33f90fc0fb912d7403f6c21c5435c1 (diff) | |
| parent | 53c403116a947c538132fc721f83196036f7a299 (diff) | |
Merge branch 'jh/push-default-upstream-configname' into maint
* jh/push-default-upstream-configname:
push.default: Rename 'tracking' to 'upstream'
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 84e308fce5..701fba92dc 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -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:: |