Merge branch 'jc/mention-tracking-for-pull-default'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 481736a471d67d11f9bda3429b342132236b12f9..3bb53da522b14fd2aedbebf1bbd92b5d20782c71 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1811,7 +1811,8 @@ push.default::
   +
   This is currently the default, but Git 2.0 will change the default
   to `simple`.
-* `upstream` - push the current branch to its upstream branch.
+* `upstream` - push the current branch to its upstream branch
+  (`tracking` is a deprecated synonym for this).
   With this, `git push` will update the same remote ref as the one which
   is merged by `git pull`, making `push` and `pull` symmetrical.
   See "branch.<name>.merge" for how to configure the upstream branch.