summaryrefslogtreecommitdiff
path: root/Documentation/git-p4.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-12-16 23:27:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-12-16 23:27:50 (GMT)
commit2a72b69407c5769db1519f82e7a10d98a3ab0352 (patch)
tree4fc7cc2a603e82d85ed626c1a29d9f4f7c47c04e /Documentation/git-p4.txt
parent796bd3bb2ac98e6aa4cb9afccc18c3056f795196 (diff)
parent89a6ecc55b55ae87c39c5d9edb115731550fba95 (diff)
downloadgit-2a72b69407c5769db1519f82e7a10d98a3ab0352.zip
git-2a72b69407c5769db1519f82e7a10d98a3ab0352.tar.gz
git-2a72b69407c5769db1519f82e7a10d98a3ab0352.tar.bz2
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/git-p4.txt')
-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 ce40b9a..bae862d 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::