summaryrefslogtreecommitdiffstats
path: root/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-20 14:03:37 -0700
committerJunio C Hamano <gitster@pobox.com>2013-09-20 14:03:37 -0700
commit79f4c7c3c9b29ade5534a5f1d01db2c67721d6a8 (patch)
tree9b5ca4ba3e78d726bab8e54347738b373d3a2eef /config.txt
parent211db89d8b8d8c3006e084f43dd6471163c7b998 (diff)
downloadgit-htmldocs-79f4c7c3c9b29ade5534a5f1d01db2c67721d6a8.tar.gz
Autogenerated HTML docs for v1.8.4-474-g128a96
Diffstat (limited to 'config.txt')
-rw-r--r--config.txt18
1 files changed, 18 insertions, 0 deletions
diff --git a/config.txt b/config.txt
index 44e787352..c3f70023e 100644
--- a/config.txt
+++ b/config.txt
@@ -2183,6 +2183,13 @@ status.branch::
Set to true to enable --branch by default in linkgit:git-status[1].
The option --no-branch takes precedence over this variable.
+status.displayCommentPrefix::
+ If set to true, linkgit:git-status[1] will insert a comment
+ prefix before each output line (starting with
+ `core.commentChar`, i.e. `#` by default). This was the
+ behavior of linkgit:git-status[1] in Git 1.8.4 and previous.
+ Defaults to false.
+
status.showUntrackedFiles::
By default, linkgit:git-status[1] and linkgit:git-commit[1] show
files which are not currently tracked by Git. Directories which
@@ -2281,6 +2288,17 @@ uploadpack.allowtipsha1inwant::
of a hidden ref (by default, such a request is rejected).
see also `uploadpack.hiderefs`.
+uploadpack.keepalive::
+ When `upload-pack` has started `pack-objects`, there may be a
+ quiet period while `pack-objects` prepares the pack. Normally
+ it would output progress information, but if `--quiet` was used
+ for the fetch, `pack-objects` will output nothing at all until
+ the pack data begins. Some clients and networks may consider
+ the server to be hung and give up. Setting this option instructs
+ `upload-pack` to send an empty keepalive packet every
+ `uploadpack.keepalive` seconds. Setting this option to 0
+ disables keepalive packets entirely. The default is 5 seconds.
+
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