summaryrefslogtreecommitdiffstats
path: root/git-p4.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-10 11:45:15 -0700
committerJunio C Hamano <gitster@pobox.com>2012-05-10 11:45:15 -0700
commitbcdb12ed43f108ca2931dda48a9b772cd4efb5f5 (patch)
tree5d6ea9a34c1a16b30b3a50d9538df86a4b92908b /git-p4.html
parent22700fb0070b260261fc5003205fe9aa9e080ce5 (diff)
downloadgit-htmldocs-bcdb12ed43f108ca2931dda48a9b772cd4efb5f5.tar.gz
Autogenerated HTML docs for v1.7.10.1-553-gb7fbc
Diffstat (limited to 'git-p4.html')
-rw-r--r--git-p4.html22
1 files changed, 11 insertions, 11 deletions
diff --git a/git-p4.html b/git-p4.html
index a5d068136..88782ec2f 100644
--- a/git-p4.html
+++ b/git-p4.html
@@ -777,14 +777,12 @@ subsequent <em>sync</em> operations.</p></div>
</p>
<div class="paragraph"><p>This example imports a new remote "p4/proj2" into an existing
git repository:</p></div>
-</dd>
-</dl></div>
<div class="listingblock">
<div class="content">
<pre><tt> $ git init
$ git p4 sync --branch=refs/remotes/p4/proj2 //depot/proj2</tt></pre>
</div></div>
-<div class="dlist"><dl>
+</dd>
<dt class="hdlist1">
--detect-branches
</dt>
@@ -1179,14 +1177,12 @@ git-p4.branchList
by a colon (:). This example declares that both branchA and
branchB were created from main:
</p>
-</dd>
-</dl></div>
<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>
</div></div>
-<div class="dlist"><dl>
+</dd>
<dt class="hdlist1">
git-p4.ignoredP4Labels
</dt>
@@ -1312,13 +1308,17 @@ git-p4.skipUserNameCheck
submission regardless.
</p>
</dd>
-</dl></div>
-<div class="paragraph"><p>git-p4.attemptRCSCleanup:
+<dt class="hdlist1">
+git-p4.attemptRCSCleanup
+</dt>
+<dd>
+<p>
If enabled, <em>git p4 submit</em> will attempt to cleanup RCS keywords
($Header$, etc). These would otherwise cause merge conflicts and prevent
the submit going ahead. This option should be considered experimental at
- present.</p></div>
-<div class="dlist"><dl>
+ present.
+</p>
+</dd>
<dt class="hdlist1">
git-p4.exportLabels
</dt>
@@ -1373,7 +1373,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 2012-04-30 15:35:49 PDT
+Last updated 2012-05-10 11:44:38 PDT
</div>
</div>
</body>