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

Doc fix.

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

diff --combined Documentation/config.txt
index 038a32d01b709cdf2c3f7a30893c53743271da02,08cb63fd2af59874533df10914e51dc13284e01e..953cf69117101988111e09a641c643ff251dd808
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -1402,12 -1402,6 +1402,12 @@@ gc.autoDetach:
        Make `git gc --auto` return immediately and run in background
        if the system supports it. Default is true.
  
 +gc.logExpiry::
 +      If the file gc.log exists, then `git gc --auto` won't run
 +      unless that file is more than 'gc.logExpiry' old.  Default is
 +      "1.day".  See `gc.pruneExpire` for more ways to specify its
 +      value.
 +
  gc.packRefs::
        Running `git pack-refs` in a repository renders it
        unclonable by Git versions prior to 1.5.1.2 over dumb
@@@ -2438,6 -2432,8 +2438,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.