Merge branch 'rs/path-name-safety-cleanup'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index cf281f64f1f2d5910b605bae95e881b8db29a8ac..0d8df5a9f95b9550d34d000027f2974ff93f4de6 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2521,6 +2521,8 @@ push.default::
   pushing to the same repository you would normally pull from
   (i.e. central workflow).
 
+* `tracking` - This is a deprecated synonym for `upstream`.
+
 * `simple` - in centralized workflow, work like `upstream` with an
   added safety to refuse to push if the upstream branch's name is
   different from the local one.