summaryrefslogtreecommitdiffstats
path: root/Documentation/config
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/config')
-rw-r--r--Documentation/config/core.adoc8
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/config/core.adoc b/Documentation/config/core.adoc
index a0ebf03e2e..340329edc3 100644
--- a/Documentation/config/core.adoc
+++ b/Documentation/config/core.adoc
@@ -589,6 +589,14 @@ core.packedRefsTimeout::
all; -1 means to try indefinitely. Default is 1000 (i.e.,
retry for 1 second).
+core.configLockTimeout::
+ The length of time, in milliseconds, to retry when trying to
+ lock a configuration file for writing. Value 0 means not to
+ retry at all; -1 means to try indefinitely. Default is 1000
+ (i.e., retry for 1 second). This is read from the configuration
+ that is already on disk before the lock is taken, so it can be
+ set persistently like any other option.
+
core.pager::
Text viewer for use by Git commands (e.g., 'less'). The value
is meant to be interpreted by the shell. The order of preference