summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-02-28 05:58:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-02-28 05:58:31 (GMT)
commit8978166e531e0941811099d4117574ebbbcf35d8 (patch)
tree97c222b3705ea1980557ae1f96dda1d272625a83 /Documentation
parentfbfeeaf29480a3299fa6c3349b7a8c1b147c18c5 (diff)
parent53c403116a947c538132fc721f83196036f7a299 (diff)
downloadgit-8978166e531e0941811099d4117574ebbbcf35d8.zip
git-8978166e531e0941811099d4117574ebbbcf35d8.tar.gz
git-8978166e531e0941811099d4117574ebbbcf35d8.tar.bz2
Merge branch 'jh/push-default-upstream-configname'
* 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 c5e1835..c995a1a 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1591,7 +1591,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::