Merge branch 'maint'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 84e308fce5b2a0a67dcb64a98e414c49e4cd3b01..701fba92dc1cfda8982aee8b66eb39b8b1c5816b 100644 (file)
--- 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::