diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-10-31 13:25:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-31 13:25:53 -0700 |
| commit | c14e6ad9a230ad90c84b7f620d87fbe49a2d0342 (patch) | |
| tree | 120346dc383e3d1c4219fe8c533eb22cb6af2b55 /git-p4.html | |
| parent | 2a4bcbc355496c8d83b1b9f8892c4cbe8f584158 (diff) | |
| download | git-htmldocs-c14e6ad9a230ad90c84b7f620d87fbe49a2d0342.tar.gz | |
Autogenerated HTML docs for v2.2.0-rc0
Diffstat (limited to 'git-p4.html')
| -rw-r--r-- | git-p4.html | 82 |
1 files changed, 40 insertions, 42 deletions
diff --git a/git-p4.html b/git-p4.html index d611a6c03..46464a4c2 100644 --- a/git-p4.html +++ b/git-p4.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.6" />
+<meta name="generator" content="AsciiDoc 8.6.9" />
<title>git-p4(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
@@ -87,10 +87,16 @@ ul, ol, li > p { ul > li { color: #aaa; }
ul > li > * { color: black; }
-pre {
+.monospaced, code, pre {
+ font-family: "Courier New", Courier, monospace;
+ font-size: inherit;
+ color: navy;
padding: 0;
margin: 0;
}
+pre {
+ white-space: pre-wrap;
+}
#author {
color: #527bbd;
@@ -219,7 +225,7 @@ div.exampleblock > div.content { }
div.imageblock div.content { padding-left: 0; }
-span.image img { border-style: none; }
+span.image img { border-style: none; vertical-align: text-bottom; }
a.image:visited { color: white; }
dl {
@@ -349,7 +355,7 @@ div.colist td img { margin-bottom: 0.1em;
}
-div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
+div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
margin-top: 0;
margin-bottom: 0;
}
@@ -407,18 +413,14 @@ span.underline { text-decoration: underline; } span.overline { text-decoration: overline; }
span.line-through { text-decoration: line-through; }
+div.unbreakable { page-break-inside: avoid; }
+
/*
* xhtml11 specific
*
* */
-tt {
- font-family: monospace;
- font-size: inherit;
- color: navy;
-}
-
div.tableblock {
margin-top: 1.0em;
margin-bottom: 1.5em;
@@ -452,12 +454,6 @@ div.tableblock > table[frame="vsides"] { *
* */
-.monospaced {
- font-family: monospace;
- font-size: inherit;
- color: navy;
-}
-
table.tableblock {
margin-top: 1.0em;
margin-bottom: 1.5em;
@@ -537,6 +533,8 @@ body.manpage div.sectionbody { @media print {
body.manpage div#toc { display: none; }
}
+
+
</style>
<script type="text/javascript">
/*<+'])');
+ var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
// Function that scans the DOM tree for header elements (the DOM2
// nodeIterator API would be a better technique but not supported by all
// browsers).
@@ -610,7 +608,7 @@ toc: function (toclevels) { var i;
for (i = 0; i < toc.childNodes.length; i++) {
var entry = toc.childNodes[i];
- if (entry.nodeName == 'div'
+ if (entry.nodeName.toLowerCase() == 'div'
&& entry.getAttribute("class")
&& entry.getAttribute("class").match(/^toclevel/))
tocEntriesToRemove.push(entry);
@@ -656,7 +654,7 @@ footnotes: function () { var entriesToRemove = [];
for (i = 0; i < noteholder.childNodes.length; i++) {
var entry = noteholder.childNodes[i];
- if (entry.nodeName == 'div' && entry.getAttribute("class") == "footnote")
+ if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
entriesToRemove.push(entry);
}
for (i = 0; i < entriesToRemove.length; i++) {
@@ -782,7 +780,7 @@ Clone a repository: </p>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git p4 clone //depot/path/project</tt></pre>
+<pre><code>$ git p4 clone //depot/path/project</code></pre>
</div></div>
</li>
<li>
@@ -791,9 +789,9 @@ Do some work in the newly created Git repository: </p>
<div class="listingblock">
<div class="content">
-<pre><tt>$ cd project
+<pre><code>$ cd project
$ vi foo.h
-$ git commit -a -m "edited foo.h"</tt></pre>
+$ git commit -a -m "edited foo.h"</code></pre>
</div></div>
</li>
<li>
@@ -803,7 +801,7 @@ Update the Git repository with recent changes from p4, rebasing your </p>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git p4 rebase</tt></pre>
+<pre><code>$ git p4 rebase</code></pre>
</div></div>
</li>
<li>
@@ -812,7 +810,7 @@ Submit your commits back to p4: </p>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git p4 submit</tt></pre>
+<pre><code>$ git p4 submit</code></pre>
</div></div>
</li>
</ul></div>
@@ -827,7 +825,7 @@ Submit your commits back to p4: from an existing p4 repository:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git p4 clone //depot/path/project</tt></pre>
+<pre><code>$ git p4 clone //depot/path/project</code></pre>
</div></div>
<div class="paragraph"><p>This:</p></div>
<div class="olist arabic"><ol class="arabic">
@@ -852,7 +850,7 @@ Creates a local branch, <em>master</em> from this remote and checks it out. the depot path:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git p4 clone //depot/path/project@all</tt></pre>
+<pre><code>$ git p4 clone //depot/path/project@all</code></pre>
</div></div>
</div>
<div class="sect2">
@@ -861,17 +859,17 @@ the depot path:</p></div> be included in the Git repository using:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git p4 sync</tt></pre>
+<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
<em>git p4 sync</em> too:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ mkdir repo-git
+<pre><code>$ mkdir repo-git
$ cd repo-git
$ git init
-$ git p4 sync //path/in/your/perforce/depot</tt></pre>
+$ 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
@@ -895,7 +893,7 @@ sense. This command does <em>git p4 sync</em> followed by <em>git rebase</em> t local commits on top of updated p4 changes.</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git p4 rebase</tt></pre>
+<pre><code>$ git p4 rebase</code></pre>
</div></div>
</div>
<div class="sect2">
@@ -909,12 +907,12 @@ will be created and populated if it does not already exist.</p></div> the <em>p4/master</em> branch, use:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git p4 submit</tt></pre>
+<pre><code>$ git p4 submit</code></pre>
</div></div>
<div class="paragraph"><p>To specify a branch other than the current one, use:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>$ git p4 submit topicbranch</tt></pre>
+<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>
@@ -975,8 +973,8 @@ behavior can be modified using the --import-local option.</p></div> Git repository:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt> $ git init
- $ git p4 sync --branch=refs/remotes/p4/proj2 //depot/proj2</tt></pre>
+<pre><code> $ git init
+ $ git p4 sync --branch=refs/remotes/p4/proj2 //depot/proj2</code></pre>
</div></div>
</dd>
<dt class="hdlist1">
@@ -1305,18 +1303,18 @@ 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">
-<pre><tt>//depot/main/...
-//depot/branch1/...</tt></pre>
+<pre><code>//depot/main/...
+//depot/branch1/...</code></pre>
</div></div>
<div class="paragraph"><p>And "p4 branch -o branch1" shows a View line that looks like:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>//depot/main/... //depot/branch1/...</tt></pre>
+<pre><code>//depot/main/... //depot/branch1/...</code></pre>
</div></div>
<div class="paragraph"><p>Then this <em>git p4 clone</em> command:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>git p4 clone --detect-branches //depot@all</tt></pre>
+<pre><code>git p4 clone --detect-branches //depot@all</code></pre>
</div></div>
<div class="paragraph"><p>produces a separate branch in <em>refs/remotes/p4/</em> for //depot/main,
called <em>master</em>, and one for //depot/branch1 called <em>depot/branch1</em>.</p></div>
@@ -1331,10 +1329,10 @@ presence of the p4 branch. Without p4 branches, the same result will occur with:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>git init depot
+<pre><code>git init depot
cd depot
git config git-p4.branchList main:branch1
-git p4 clone --detect-branches //depot@all .</tt></pre>
+git p4 clone --detect-branches //depot@all .</code></pre>
</div></div>
</div>
</div>
@@ -1443,8 +1441,8 @@ git-p4.branchList </p>
<div class="listingblock">
<div class="content">
-<pre><tt>git config git-p4.branchList main:branchA
-git config --add git-p4.branchList main:branchB</tt></pre>
+<pre><code>git config git-p4.branchList main:branchA
+git config --add git-p4.branchList main:branchB</code></pre>
</div></div>
</dd>
<dt class="hdlist1">
|