summaryrefslogtreecommitdiffstats
path: root/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-21 15:49:01 -0700
committerJunio C Hamano <gitster@pobox.com>2013-03-21 15:49:01 -0700
commit5e7f131ec750093b9c1691ff92db43b0595ea98c (patch)
tree336c153c1aecfeab7cab7cf3502a7ffe0a6d7d6f /config.txt
parent947ab826679af3ad71f1bd69391deca3bc6edad9 (diff)
downloadgit-htmldocs-5e7f131ec750093b9c1691ff92db43b0595ea98c.tar.gz
Autogenerated HTML docs for v1.8.2-135-g7b592
Diffstat (limited to 'config.txt')
-rw-r--r--config.txt12
1 files changed, 11 insertions, 1 deletions
diff --git a/config.txt b/config.txt
index b3023b817..c1f435f6d 100644
--- a/config.txt
+++ b/config.txt
@@ -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.
@@ -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