From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Mar 2017 22:07:19 +0000 (-0700)
Subject: Merge branch 'ab/push-default-doc-fix'
X-Git-Tag: v2.13.0-rc0~87
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b7b57b143417f8b89e17aeb501b7c54c13508959?hp=9f43095e4638ec070b361762a43001563177394f

Merge branch 'ab/push-default-doc-fix'

Doc fix.

* ab/push-default-doc-fix:
push: mention "push.default=tracking" in the documentation
---

diff --git a/Documentation/config.txt b/Documentation/config.txt
index cf281f64f1..0d8df5a9f9 100644
--- 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.