Merge branch 'mh/ref-lock-entry'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 9b42e0ca73429d01f987b2b93c413ab49a98fef4..dc4e3f58a2d2e8a5a6753bd290d65fec4f7f7b21 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -776,6 +776,12 @@ core.commentChar::
 If set to "auto", `git-commit` would select a character that is not
 the beginning character of any line in existing commit messages.
 
+core.filesRefLockTimeout::
+       The length of time, in milliseconds, to retry when trying to
+       lock an individual reference. Value 0 means not to retry at
+       all; -1 means to try indefinitely. Default is 100 (i.e.,
+       retry for 100ms).
+
 core.packedRefsTimeout::
        The length of time, in milliseconds, to retry when trying to
        lock the `packed-refs` file. Value 0 means not to retry at