Merge branch 'maint'

* maint:
git help config: s/insn/instruction/

diff --combined Documentation/config.txt
index c1f435f6df0b2e16d50546b61c2abab50b67acc0,b82e0816cbd775de8d34b3af2afb21c97d98bbf7..f79184c0a83170ea54298f2b8ac960372371b0f3
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -178,10 -178,6 +178,10 @@@ advice.*:
                the template shown when writing commit messages in
                linkgit:git-commit[1], and in the help message shown
                by linkgit:git-checkout[1] when switching branch.
 +      statusUoption::
 +              Advise to consider using the `-u` option to linkgit:git-status[1]
 +              when the command takes more than 2 seconds to enumerate untracked
 +              files.
        commitBeforeMerge::
                Advice shown when linkgit:git-merge[1] refuses to
                merge to avoid overwriting local changes.
@@@ -555,7 -551,7 +555,7 @@@ core.commentchar:
        (default '#').
  
  sequence.editor::
-       Text editor used by `git rebase -i` for editing the rebase insn file.
+       Text editor used by `git rebase -i` for editing the rebase instruction file.
        The value is meant to be interpreted by the shell when it is used.
        It can be overridden by the `GIT_SEQUENCE_EDITOR` environment variable.
        When not configured the default commit message editor is used instead.
@@@ -2123,13 -2119,7 +2123,13 @@@ uploadpack.hiderefs:
        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.
 +      fetch` will fail.  See also `uploadpack.allowtipsha1inwant`.
 +
 +uploadpack.allowtipsha1inwant::
 +      When `uploadpack.hiderefs` is in effect, allow `upload-pack`
 +      to accept a fetch request that asks for an object at the tip
 +      of a hidden ref (by default, such a request is rejected).
 +      see also `uploadpack.hiderefs`.
  
  url.<base>.insteadOf::
        Any URL that starts with this value will be rewritten to