Autogenerated HTML docs for v1.8.1.2-545-g2f19ad

1 files changed, 43 insertions, 43 deletions

diff --git a/git-p4.html b/git-p4.html
index 49ff58ff5..326195d9a 100644
--- a/git-p4.html
+++ b/git-p4.html
@@ -758,12 +758,12 @@ git-p4(1) Manual Page
 <h2 id="_description">DESCRIPTION</h2>

 <div class="sectionbody">

 <div class="paragraph"><p>This command provides a way to interact with p4 repositories

-using git.</p></div>

-<div class="paragraph"><p>Create a new git repository from an existing p4 repository using

+using Git.</p></div>

+<div class="paragraph"><p>Create a new Git repository from an existing p4 repository using

 <em>git p4 clone</em>, giving it one or more p4 depot paths.  Incorporate

 new commits from p4 changes with <em>git p4 sync</em>.  The <em>sync</em> command

 is also used to include new branches from other p4 depot paths.

-Submit git changes back to p4 using <em>git p4 submit</em>.  The command

+Submit Git changes back to p4 using <em>git p4 submit</em>.  The command

 <em>git p4 rebase</em> does a sync plus rebases the current branch onto

 the updated p4 remote branch.</p></div>

 </div>

@@ -783,7 +783,7 @@ Clone a repository:
 </li>

 <li>

 <p>

-Do some work in the newly created git repository:

+Do some work in the newly created Git repository:

 </p>

 <div class="listingblock">

 <div class="content">

@@ -794,7 +794,7 @@ $ git commit -a -m "edited foo.h"</code></pre>
 </li>

 <li>

 <p>

-Update the git repository with recent changes from p4, rebasing your

+Update the Git repository with recent changes from p4, rebasing your

   work on top:

 </p>

 <div class="listingblock">

@@ -819,7 +819,7 @@ Submit your commits back to p4:
 <div class="sectionbody">

 <div class="sect2">

 <h3 id="_clone">Clone</h3>

-<div class="paragraph"><p>Generally, <em>git p4 clone</em> is used to create a new git directory

+<div class="paragraph"><p>Generally, <em>git p4 clone</em> is used to create a new Git directory

 from an existing p4 repository:</p></div>

 <div class="listingblock">

 <div class="content">

@@ -829,13 +829,13 @@ from an existing p4 repository:</p></div>
 <div class="olist arabic"><ol class="arabic">

 <li>

 <p>

-Creates an empty git repository in a subdirectory called <em>project</em>.

+Creates an empty Git repository in a subdirectory called <em>project</em>.

 </p>

 </li>

 <li>

 <p>

 Imports the full contents of the head revision from the given p4

-depot path into a single commit in the git branch <em>refs/remotes/p4/master</em>.

+depot path into a single commit in the Git branch <em>refs/remotes/p4/master</em>.

 </p>

 </li>

 <li>

@@ -844,7 +844,7 @@ Creates a local branch, <em>master</em> from this remote and checks it out.
 </p>

 </li>

 </ol></div>

-<div class="paragraph"><p>To reproduce the entire p4 history in git, use the <em>@all</em> modifier on

+<div class="paragraph"><p>To reproduce the entire p4 history in Git, use the <em>@all</em> modifier on

 the depot path:</p></div>

 <div class="listingblock">

 <div class="content">

@@ -854,13 +854,13 @@ the depot path:</p></div>
 <div class="sect2">

 <h3 id="_sync">Sync</h3>

 <div class="paragraph"><p>As development continues in the p4 repository, those changes can

-be included in the git repository using:</p></div>

+be included in the Git repository using:</p></div>

 <div class="listingblock">

 <div class="content">

 <pre><code>$ git p4 sync</code></pre>

 </div></div>

-<div class="paragraph"><p>This command finds new changes in p4 and imports them as git commits.</p></div>

-<div class="paragraph"><p>P4 repositories can be added to an existing git repository using

+<div class="paragraph"><p>This command finds new changes in p4 and imports them as Git commits.</p></div>

+<div class="paragraph"><p>P4 repositories can be added to an existing Git repository using

 <em>git p4 sync</em> too:</p></div>

 <div class="listingblock">

 <div class="content">

@@ -870,13 +870,13 @@ $ git init
 $ 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>refs/remotes/p4/master</em> in an existing Git repository.  The

 <em>--branch</em> 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

+<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

 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>

+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>

@@ -896,12 +896,12 @@ local commits on top of updated p4 changes.</p></div>
 </div>

 <div class="sect2">

 <h3 id="_submit">Submit</h3>

-<div class="paragraph"><p>Submitting changes from a git repository back to the p4 repository

+<div class="paragraph"><p>Submitting changes from a Git repository back to the p4 repository

 requires a separate p4 client workspace.  This should be specified

-using the <em>P4CLIENT</em> environment variable or the git configuration

+using the <em>P4CLIENT</em> environment variable or the Git configuration

 variable <em>git-p4.client</em>.  The p4 client must exist, but the client root

 will be created and populated if it does not already exist.</p></div>

-<div class="paragraph"><p>To submit all changes that are in the current git branch but not in

+<div class="paragraph"><p>To submit all changes that are in the current Git branch but not in

 the <em>p4/master</em> branch, use:</p></div>

 <div class="listingblock">

 <div class="content">

@@ -916,7 +916,7 @@ the <em>p4/master</em> branch, use:</p></div>
 be overridden using the <em>--origin=</em> 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

-according to the author of the git commit.  This option requires admin

+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>

 </div>

@@ -964,7 +964,7 @@ subsequent <em>sync</em> operations.</p></div>
         branch is <em>master</em>.

 </p>

 <div class="paragraph"><p>This example imports a new remote "p4/proj2" into an existing

-git repository:</p></div>

+Git repository:</p></div>

 <div class="listingblock">

 <div class="content">

 <pre><code>    $ git init

@@ -1004,7 +1004,7 @@ git repository:</p></div>
 <dd>

 <p>

         Query p4 for labels associated with the depot paths, and add

-        them as tags in git. Limited usefulness as only imports labels

+        them as tags in Git. Limited usefulness as only imports labels

         associated with new changelists. Deprecated.

 </p>

 </dd>

@@ -1013,7 +1013,7 @@ git repository:</p></div>
 </dt>

 <dd>

 <p>

-        Import labels from p4 into git.

+        Import labels from p4 into Git.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1044,12 +1044,12 @@ git repository:</p></div>
 </dt>

 <dd>

 <p>

-        The mapping of file names from the p4 depot path to git, by

+        The mapping of file names from the p4 depot path to Git, by

         default, involves removing the entire depot path.  With this

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

+        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

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

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

 </p>

 </dd>

 <dt class="hdlist1">

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

 <dd>

 <p>

-        Where to create the git repository.  If not provided, the last

+        Where to create the Git repository.  If not provided, the last

         component in the p4 depot path is used to create a new

         directory.

 </p>

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

 <dd>

 <p>

-        Export tags from git as p4 labels. Tags found in git are applied

+        Export tags from Git as p4 labels. Tags found in Git are applied

         to the perforce working directory.

 </p>

 </dd>

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

 <p>

         Show just what commits would be submitted to p4; do not change

-        state in git or p4.

+        state in Git or p4.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1238,12 +1238,12 @@ p4 revision specifier on the end:</p></div>
 <p>

     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".

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

     You must use the <em>--destination</em> 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

-    updated version of the file is the one that appears in git.

+    updated version of the file is the one that appears in Git.

 </p>

 </dd>

 </dl></div>

@@ -1262,11 +1262,11 @@ useClientSpec variable is automatically set in the repository
 configuration file.  This allows future <em>git p4 submit</em> commands to

 work properly; the submit command looks only at the variable and does

 not have a command-line option.</p></div>

-<div class="paragraph"><p>The full syntax for a p4 view is documented in <em>p4 help views</em>.  <em>Git p4</em>

+<div class="paragraph"><p>The full syntax for a p4 view is documented in <em>p4 help views</em>.  <em>git p4</em>

 knows only a subset of the view syntax.  It understands multi-line

 mappings, overlays with <em>+</em>, exclusions with <em>-</em> and double-quotes

 around whitespace.  Of the possible wildcards, <em>git p4</em> only handles

-<em>&#8230;</em>, and only when it is at the end of the path.  <em>Git p4</em> will complain

+<em>&#8230;</em>, and only when it is at the end of the path.  <em>git p4</em> will complain

 if it encounters an unhandled wildcard.</p></div>

 <div class="paragraph"><p>Bugs in the implementation of overlap mappings exist.  If multiple depot

 paths map through overlays to the same location in the repository,

@@ -1281,7 +1281,7 @@ variable P4CLIENT, a file referenced by P4CONFIG, or the local host name.</p></d
 <div class="sect1">

 <h2 id="_branch_detection">BRANCH DETECTION</h2>

 <div class="sectionbody">

-<div class="paragraph"><p>P4 does not have the same concept of a branch as git.  Instead,

+<div class="paragraph"><p>P4 does not have the same concept of a branch as Git.  Instead,

 p4 organizes its content as a directory tree, where by convention

 different logical branches are in different locations in the tree.

 The <em>p4 branch</em> command is used to maintain mappings between

@@ -1290,7 +1290,7 @@ 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>

 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>

+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>

 <div class="listingblock">

 <div class="content">

@@ -1311,7 +1311,7 @@ subdirectories in p4, and to generate these as branches in git.</p></div>
 called <em>master</em>, and one for //depot/branch1 called <em>depot/branch1</em>.</p></div>

 <div class="paragraph"><p>However, it is not necessary to create branches in p4 to be able to use

 them like branches.  Because it is difficult to infer branch

-relationships automatically, a git configuration setting

+relationships automatically, a Git configuration setting

 <em>git-p4.branchList</em> can be used to explicitly identify branch

 relationships.  It is a list of "source:destination" pairs, like a

 simple p4 branch specification, where the "source" and "destination" are

@@ -1331,7 +1331,7 @@ git p4 clone --detect-branches //depot@all .</code></pre>
 <h2 id="_performance">PERFORMANCE</h2>

 <div class="sectionbody">

 <div class="paragraph"><p>The fast-import mechanism used by <em>git p4</em> creates one pack file for

-each invocation of <em>git p4 sync</em>.  Normally, git garbage compression

+each invocation of <em>git p4 sync</em>.  Normally, Git garbage compression

 (<a href="git-gc.html">git-gc(1)</a>) automatically compresses these to fewer pack files,

 but explicit invocation of <em>git repack -adf</em> may improve performance.</p></div>

 </div>

@@ -1402,9 +1402,9 @@ git-p4.syncFromOrigin
 </dt>

 <dd>

 <p>

-        Because importing commits from other git repositories is much faster

+        Because importing commits from other Git repositories is much faster

         than importing them from p4, a mechanism exists to find p4 changes

-        first in git remotes.  If branches exist under <em>refs/remote/origin/p4</em>,

+        first in Git remotes.  If branches exist under <em>refs/remote/origin/p4</em>,

         those will be fetched and used when syncing from p4.  This

         variable can be set to <em>false</em> to disable this behavior.

 </p>

@@ -1509,7 +1509,7 @@ git-p4.preserveUser
 </dt>

 <dd>

 <p>

-        On submit, re-author changes to reflect the git author,

+        On submit, re-author changes to reflect the Git author,

         regardless of who invokes <em>git p4 submit</em>.

 </p>

 </dd>

@@ -1581,7 +1581,7 @@ git-p4.exportLabels
 </dt>

 <dd>

 <p>

-        Export git tags to p4 labels, as per --export-labels.

+        Export Git tags to p4 labels, as per --export-labels.

 </p>

 </dd>

 <dt class="hdlist1">

@@ -1612,7 +1612,7 @@ git-p4.conflict
 <div class="ulist"><ul>

 <li>

 <p>

-Changesets from p4 are imported using git fast-import.

+Changesets from p4 are imported using Git fast-import.

 </p>

 </li>

 <li>

@@ -1624,7 +1624,7 @@ Cloning or syncing does not require a p4 client; file contents are
 <li>

 <p>

 Submitting requires a p4 client, which is not in the same location

-  as the git repository.  Patches are applied, one at a time, to

+  as the Git repository.  Patches are applied, one at a time, to

   this p4 client and submitted from there.

 </p>

 </li>

@@ -1643,7 +1643,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 2013-01-22 11:18:46 PST

+Last updated 2013-02-05 21:07:26 PST

 </div>

 </div>

 </body>