summaryrefslogtreecommitdiffstats
path: root/git-cherry-pick.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-06-08 11:40:53 -0700
committerJunio C Hamano <gitster@pobox.com>2012-06-08 11:40:53 -0700
commit719b8a3137af7aea177e42a98cdfbb5180a10f33 (patch)
tree0b0aceeacfdab20db87a431a8a95e1388f0d9e19 /git-cherry-pick.html
parent022bd341a82a08e16719ab8744973feed49e94d3 (diff)
downloadgit-htmldocs-719b8a3137af7aea177e42a98cdfbb5180a10f33.tar.gz
Autogenerated HTML docs for v1.7.11-rc2-2-g02101
Diffstat (limited to 'git-cherry-pick.html')
-rw-r--r--git-cherry-pick.html16
1 files changed, 8 insertions, 8 deletions
diff --git a/git-cherry-pick.html b/git-cherry-pick.html
index 1f91b4966..a04885888 100644
--- a/git-cherry-pick.html
+++ b/git-cherry-pick.html
@@ -620,7 +620,7 @@ Paths in which the change applied cleanly are updated both
<p>
For conflicting paths, the index file records up to three
versions, as described in the "TRUE MERGE" section of
- <a href="git-merge.html">git-merge(1)</a>. The working tree files will include
+ . The working tree files will include
a description of the conflict bracketed by the usual
conflict markers <tt>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</tt> and <tt>&gt;&gt;&gt;&gt;&gt;&gt;&gt;</tt>.
</p>
@@ -631,7 +631,7 @@ No other modifications are made.
</p>
</li>
</ol></div>
-<div class="paragraph"><p>See <a href="git-merge.html">git-merge(1)</a> for some hints on resolving such
+<div class="paragraph"><p>See for some hints on resolving such
conflicts.</p></div>
</div>
<h2 id="_options">OPTIONS</h2>
@@ -644,10 +644,10 @@ conflicts.</p></div>
<p>
Commits to cherry-pick.
For a more complete list of ways to spell commits, see
- <a href="gitrevisions.html">gitrevisions(7)</a>.
+ .
Sets of commits can be passed but no traversal is done by
default, as if the <em>--no-walk</em> option was specified, see
- <a href="git-rev-list.html">git-rev-list(1)</a>.
+ .
</p>
</dd>
<dt class="hdlist1">
@@ -781,7 +781,7 @@ effect to your index in a row.</p></div>
<dd>
<p>
Use the given merge strategy. Should only be used once.
- See the MERGE STRATEGIES section in <a href="git-merge.html">git-merge(1)</a>
+ See the MERGE STRATEGIES section in
for details.
</p>
</dd>
@@ -794,7 +794,7 @@ effect to your index in a row.</p></div>
<dd>
<p>
Pass the merge strategy-specific option through to the
- merge strategy. See <a href="git-merge.html">git-merge(1)</a> for details.
+ merge strategy. See for details.
</p>
</dd>
</dl></div>
@@ -943,11 +943,11 @@ context lines.
</div>
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
-<div class="paragraph"><p><a href="git-revert.html">git-revert(1)</a></p></div>
+<div class="paragraph"><p></p></div>
</div>
<h2 id="_git">GIT</h2>
<div class="sectionbody">
-<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
+<div class="paragraph"><p>Part of the suite</p></div>
</div>
</div>
<div id="footnotes"><hr /></div>