path: root/Documentation
diff options
authorJunio C Hamano <>2015-05-22 19:41:55 (GMT)
committerJunio C Hamano <>2015-05-22 19:41:55 (GMT)
commitfb257bfa174b00e236ac5d6f4282a487f10a9e98 (patch)
tree616da2c04e2140fe22bd4cfaf7f3b9b764d769c3 /Documentation
parent29b2041c2a91d2f80afa9d4e0f6eeb77a3ff5bc6 (diff)
parentf4ab4f3ab117cf375ae7bb8908c7b5ad687342b1 (diff)
Merge branch 'mh/lockfile-retry'
Instead of dying immediately upon failing to obtain a lock, retry after a short while with backoff. * mh/lockfile-retry: lock_packed_refs(): allow retries when acquiring the packed-refs lock lockfile: allow file locking to be retried with a timeout
Diffstat (limited to 'Documentation')
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 54cbf6b..0f668bb 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -624,6 +624,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.
+ The length of time, in milliseconds, to retry when trying to
+ lock the `packed-refs` file. Value 0 means not to retry at
+ all; -1 means to try indefinitely. Default is 1000 (i.e.,
+ retry for 1 second).
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.