From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 24 Mar 2017 19:57:54 +0000 (-0700)
Subject: Merge branch 'ab/push-default-doc-fix' into maint
X-Git-Tag: v2.12.2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ce9e6178d31a61db05acd2c7311651d1da31d18f?ds=inline;hp=-c

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

Doc fix.

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

ce9e6178d31a61db05acd2c7311651d1da31d18f
diff --combined Documentation/config.txt
index 038a32d01b,08cb63fd2a..953cf69117
--- a/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.