summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-12-16 15:27:50 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-12-16 15:27:50 -0800
commit2a72b69407c5769db1519f82e7a10d98a3ab0352 (patch)
tree4fc7cc2a603e82d85ed626c1a29d9f4f7c47c04e /Documentation
parentMerge branch 'ls/p4-empty-file-on-lfs' (diff)
parentgit-p4: add config to retry p4 commands; retry 3 times by default (diff)
downloadtgif-2a72b69407c5769db1519f82e7a10d98a3ab0352.tar.xz
Merge branch 'ls/p4-retry-thrice'
* ls/p4-retry-thrice: git-p4: add config to retry p4 commands; retry 3 times by default
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-p4.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index ce40b9a547..bae862ddcb 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -476,6 +476,10 @@ git-p4.client::
Client specified as an option to all p4 commands, with
'-c <client>', including the client spec.
+git-p4.retries::
+ Specifies the number of times to retry a p4 command (notably,
+ 'p4 sync') if the network times out. The default value is 3.
+
Clone and sync variables
~~~~~~~~~~~~~~~~~~~~~~~~
git-p4.syncFromOrigin::