summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-16 23:47:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-16 23:47:26 (GMT)
commit61a6f1faecf19d7727bdfae012a14747c672cb1a (patch)
tree414004f8e28dfbd74f37ed161bc0dd491219b01e /Documentation
parent7633a5ab9a33f90fc0fb912d7403f6c21c5435c1 (diff)
parent53c403116a947c538132fc721f83196036f7a299 (diff)
downloadgit-61a6f1faecf19d7727bdfae012a14747c672cb1a.zip
git-61a6f1faecf19d7727bdfae012a14747c672cb1a.tar.gz
git-61a6f1faecf19d7727bdfae012a14747c672cb1a.tar.bz2
Merge branch 'jh/push-default-upstream-configname' into maint
* jh/push-default-upstream-configname: push.default: Rename 'tracking' to 'upstream'
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 84e308f..701fba9 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::