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

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 9b115973870d164b13334726ef9dad37802f0616..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.
@@ -1880,6 +1881,15 @@ receive.denyNonFastForwards::
        even if that push is forced. This configuration variable is
        set when initializing a shared repository.
 
+receive.hiderefs::
+       String(s) `receive-pack` uses to decide which refs to omit
+       from its initial advertisement.  Use more than one
+       definitions to specify multiple prefix strings. A ref that
+       are under the hierarchies listed on the value of this
+       variable is excluded, and is hidden when responding to `git
+       push`, and an attempt to update or delete a hidden ref by
+       `git push` is rejected.
+
 receive.updateserverinfo::
        If set to true, git-receive-pack will run git-update-server-info
        after receiving data from git-push and updating refs.
@@ -2092,11 +2102,25 @@ transfer.fsckObjects::
        not set, the value of this variable is used instead.
        Defaults to false.
 
+transfer.hiderefs::
+       This variable can be used to set both `receive.hiderefs`
+       and `uploadpack.hiderefs` at the same time to the same
+       values.  See entries for these other variables.
+
 transfer.unpackLimit::
        When `fetch.unpackLimit` or `receive.unpackLimit` are
        not set, the value of this variable is used instead.
        The default value is 100.
 
+uploadpack.hiderefs::
+       String(s) `upload-pack` uses to decide which refs to omit
+       from its initial advertisement.  Use more than one
+       definitions to specify multiple prefix strings. A ref that
+       are under the hierarchies listed on the value of this
+       variable is excluded, and is hidden from `git ls-remote`,
+       `git fetch`, etc.  An attempt to fetch a hidden ref by `git
+       fetch` will fail.
+
 url.<base>.insteadOf::
        Any URL that starts with this value will be rewritten to
        start, instead, with <base>. In cases where some site serves a