diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-12-16 15:43:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-16 15:43:10 -0800 |
| commit | 18a1532395f7adb2f9972cdc8551b3fa13f2a4a4 (patch) | |
| tree | 02d62e6234cd0323ba4b7ad5b6bf04acb37aef03 /git-p4.html | |
| parent | b53e588452bf69a47cbaf4c0a9248af9256e65ee (diff) | |
| download | git-htmldocs-18a1532395f7adb2f9972cdc8551b3fa13f2a4a4.tar.gz | |
Autogenerated HTML docs for v2.11.0-65-geff96d
Diffstat (limited to 'git-p4.html')
| -rw-r--r-- | git-p4.html | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/git-p4.html b/git-p4.html index 6adf196f1..c3369a12a 100644 --- a/git-p4.html +++ b/git-p4.html @@ -1186,6 +1186,25 @@ options described above.</p></div> </p>
</dd>
<dt class="hdlist1">
+--shelve
+</dt>
+<dd>
+<p>
+ Instead of submitting create a series of shelved changelists.
+ After creating each shelve, the relevant files are reverted/deleted.
+ If you have multiple commits pending multiple shelves will be created.
+</p>
+</dd>
+<dt class="hdlist1">
+--update-shelve CHANGELIST
+</dt>
+<dd>
+<p>
+ Update an existing shelved changelist with this commit. Implies
+ --shelve.
+</p>
+</dd>
+<dt class="hdlist1">
--conflict=(ask|skip|quit)
</dt>
<dd>
@@ -1417,6 +1436,15 @@ git-p4.client <em>-c <client></em>, including the client spec.
</p>
</dd>
+<dt class="hdlist1">
+git-p4.retries
+</dt>
+<dd>
+<p>
+ Specifies the number of times to retry a p4 command (notably,
+ <em>p4 sync</em>) if the network times out. The default value is 3.
+</p>
+</dd>
</dl></div>
</div>
<div class="sect2">
@@ -1759,7 +1787,7 @@ Each commit imported by <em>git p4</em> has a line at the end of the log <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2016-07-13 14:58:50 PDT
+Last updated 2016-12-16 15:42:52 PST
</div>
</div>
</body>
|