Autogenerated HTML docs for v2.9.1-273-g79ed4

1 files changed, 12 insertions, 12 deletions

diff --git a/git-p4.html b/git-p4.html
index 1f69b6323..6adf196f1 100644
--- a/git-p4.html
+++ b/git-p4.html
@@ -873,7 +873,7 @@ $ git p4 sync //path/in/your/perforce/depot</code></pre>
 </div></div>

 <div class="paragraph"><p>This imports the specified depot into

 <em>refs/remotes/p4/master</em> in an existing Git repository.  The

-<em>--branch</em> option can be used to specify a different branch to

+<code>--branch</code> option can be used to specify a different branch to

 be used for the p4 content.</p></div>

 <div class="paragraph"><p>If a Git repository includes branches <em>refs/remotes/origin/p4</em>, these

 will be fetched and consulted first during a <em>git p4 sync</em>.  Since

@@ -881,7 +881,7 @@ importing directly from p4 is considerably slower than pulling changes
 from a Git remote, this can be useful in a multi-developer environment.</p></div>

 <div class="paragraph"><p>If there are multiple branches, doing <em>git p4 sync</em> will automatically

 use the "BRANCH DETECTION" algorithm to try to partition new changes

-into the right branch.  This can be overridden with the <em>--branch</em>

+into the right branch.  This can be overridden with the <code>--branch</code>

 option to specify just a single branch to update.</p></div>

 </div>

 <div class="sect2">

@@ -915,9 +915,9 @@ the <em>p4/master</em> branch, use:</p></div>
 <pre><code>$ git p4 submit topicbranch</code></pre>

 </div></div>

 <div class="paragraph"><p>The upstream reference is generally <em>refs/remotes/p4/master</em>, but can

-be overridden using the <em>--origin=</em> command-line option.</p></div>

+be overridden using the <code>--origin=</code> command-line option.</p></div>

 <div class="paragraph"><p>The p4 changes will be created as the user invoking <em>git p4 submit</em>. The

-<em>--preserve-user</em> option will cause ownership to be modified

+<code>--preserve-user</code> option will cause ownership to be modified

 according to the author of the Git commit.  This option requires admin

 privileges in p4, which can be granted using <em>p4 protect</em>.</p></div>

 </div>

@@ -1031,7 +1031,7 @@ Git repository:</p></div>
         where they will be treated as remote-tracking branches by

         <a href="git-branch.html">git-branch(1)</a> and other commands.  This option instead

         puts p4 branches in <em>refs/heads/p4/</em>.  Note that future

-        sync operations must specify <em>--import-local</em> as well so that

+        sync operations must specify <code>--import-local</code> as well so that

         they can find the p4 branches in refs/heads.

 </p>

 </dd>

@@ -1070,7 +1070,7 @@ Git repository:</p></div>
         default, involves removing the entire depot path.  With this

         option, the full p4 depot path is retained in Git.  For example,

         path <em>//depot/main/foo/bar.c</em>, when imported from

-        <em>//depot/main/</em>, becomes <em>foo/bar.c</em>.  With <em>--keep-path</em>, the

+        <em>//depot/main/</em>, becomes <em>foo/bar.c</em>.  With <code>--keep-path</code>, the

         Git path is instead <em>depot/main/foo/bar.c</em>.

 </p>

 </dd>

@@ -1129,7 +1129,7 @@ options described above.</p></div>
 <p>

         Upstream location from which commits are identified to submit to

         p4.  By default, this is the most recent p4 commit reachable

-        from <em>HEAD</em>.

+        from <code>HEAD</code>.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1264,7 +1264,7 @@ p4 revision specifier on the end:</p></div>
     Import all changes from both named depot paths into a single

     repository.  Only files below these directories are included.

     There is not a subdirectory in Git for each "proj1" and "proj2".

-    You must use the <em>--destination</em> option when specifying more

+    You must use the <code>--destination</code> option when specifying more

     than one depot path.  The revision specifier must be specified

     identically on each depot path.  If there are files in the

     depot paths with the same name, the path with the most recently

@@ -1281,7 +1281,7 @@ p4 revision specifier on the end:</p></div>
 <div class="paragraph"><p>The p4 client specification is maintained with the <em>p4 client</em> command

 and contains among other fields, a View that specifies how the depot

 is mapped into the client repository.  The <em>clone</em> and <em>sync</em> commands

-can consult the client spec when given the <em>--use-client-spec</em> option or

+can consult the client spec when given the <code>--use-client-spec</code> option or

 when the useClientSpec variable is true.  After <em>git p4 clone</em>, the

 useClientSpec variable is automatically set in the repository

 configuration file.  This allows future <em>git p4 submit</em> commands to

@@ -1313,7 +1313,7 @@ The <em>p4 branch</em> command is used to maintain mappings between
 different areas in the tree, and indicate related content.  <em>git p4</em>

 can use these mappings to determine branch relationships.</p></div>

 <div class="paragraph"><p>If you have a repository where all the branches of interest exist as

-subdirectories of a single depot path, you can use <em>--detect-branches</em>

+subdirectories of a single depot path, you can use <code>--detect-branches</code>

 when cloning or syncing to have <em>git p4</em> automatically find

 subdirectories in p4, and to generate these as branches in Git.</p></div>

 <div class="paragraph"><p>For example, if the P4 repository structure is:</p></div>

@@ -1494,7 +1494,7 @@ git-p4.useClientSpec
 <p>

         Specify that the p4 client spec should be used to identify p4

         depot paths of interest.  This is equivalent to specifying the

-        option <em>--use-client-spec</em>.  See the "CLIENT SPEC" section above.

+        option <code>--use-client-spec</code>.  See the "CLIENT SPEC" section above.

         This variable is a boolean, not the name of a p4 client.

 </p>

 </dd>

@@ -1759,7 +1759,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-06-27 11:04:05 PDT

+Last updated 2016-07-13 14:58:50 PDT

 </div>

 </div>

 </body>