Autogenerated HTML docs for v2.19.1-593-gc670b

1 files changed, 6 insertions, 6 deletions

diff --git a/git-p4.html b/git-p4.html
index 282cba965..54d507078 100644
--- a/git-p4.html
+++ b/git-p4.html
@@ -937,18 +937,18 @@ $ git p4 submit --update-shelve 1234 --update-shelve 2345</code></pre>
 <div class="sect2">

 <h3 id="_unshelve">Unshelve</h3>

 <div class="paragraph"><p>Unshelving will take a shelved P4 changelist, and produce the equivalent git commit

-in the branch refs/remotes/p4/unshelved/&lt;changelist&gt;.</p></div>

+in the branch refs/remotes/p4-unshelved/&lt;changelist&gt;.</p></div>

 <div class="paragraph"><p>The git commit is created relative to the current origin revision (HEAD by default).

-If the shelved changelist&#8217;s parent revisions differ, git-p4 will refuse to unshelve;

-you need to be unshelving onto an equivalent tree.</p></div>

+A parent commit is created based on the origin, and then the unshelve commit is

+created based on that.</p></div>

 <div class="paragraph"><p>The origin revision can be changed with the "--origin" option.</p></div>

-<div class="paragraph"><p>If the target branch in refs/remotes/p4/unshelved already exists, the old one will

+<div class="paragraph"><p>If the target branch in refs/remotes/p4-unshelved already exists, the old one will

 be renamed.</p></div>

 <div class="listingblock">

 <div class="content">

 <pre><code>$ git p4 sync

 $ git p4 unshelve 12345

-$ git show refs/remotes/p4/unshelved/12345

+$ git show p4-unshelved/12345

 &lt;submit more changes via p4 to the same files&gt;

 $ git p4 unshelve 12345

 &lt;refuses to unshelve until git is in sync with p4 again&gt;</code></pre>

@@ -1888,7 +1888,7 @@ Each commit imported by <em>git p4</em> has a line at the end of the log
 <div id="footer">

 <div id="footer-text">

 Last updated

- 2018-08-17 15:20:20 PDT

+ 2018-10-26 15:36:57 JST

 </div>

 </div>

 </body>