summaryrefslogtreecommitdiffstats
path: root/git-rebase.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-rebase.html
parent022bd341a82a08e16719ab8744973feed49e94d3 (diff)
downloadgit-htmldocs-719b8a3137af7aea177e42a98cdfbb5180a10f33.tar.gz
Autogenerated HTML docs for v1.7.11-rc2-2-g02101
Diffstat (limited to 'git-rebase.html')
-rw-r--r--git-rebase.html24
1 files changed, 12 insertions, 12 deletions
diff --git a/git-rebase.html b/git-rebase.html
index bbdef983e..8411038f1 100644
--- a/git-rebase.html
+++ b/git-rebase.html
@@ -598,7 +598,7 @@ git-rebase(1) Manual Page
it remains on the current branch.</p></div>
<div class="paragraph"><p>If &lt;upstream&gt; is not specified, the upstream configured in
branch.&lt;name&gt;.remote and branch.&lt;name&gt;.merge options will be used; see
-<a href="git-config.html">git-config(1)</a> for details. If you are currently not on any
+ for details. If you are currently not on any
branch or if the current branch does not have a configured upstream,
the rebase will abort.</p></div>
<div class="paragraph"><p>All changes made by commits in the current branch but that are not
@@ -946,7 +946,7 @@ which makes little sense.</p></div>
</dt>
<dd>
<p>
- This option bypasses the pre-rebase hook. See also <a href="githooks.html">githooks(5)</a>.
+ This option bypasses the pre-rebase hook. See also .
</p>
</dd>
<dt class="hdlist1">
@@ -955,7 +955,7 @@ which makes little sense.</p></div>
<dd>
<p>
Allows the pre-rebase hook to run, which is the default. This option can
- be used to override --no-verify. See also <a href="githooks.html">githooks(5)</a>.
+ be used to override --no-verify. See also .
</p>
</dd>
<dt class="hdlist1">
@@ -998,7 +998,7 @@ the reversion" (see the
<dd>
<p>
These flag are passed to the <em>git apply</em> program
- (see <a href="git-apply.html">git-apply(1)</a>) that applies the patch.
+ (see ) that applies the patch.
Incompatible with the --interactive option.
</p>
</dd>
@@ -1011,7 +1011,7 @@ the reversion" (see the
<dd>
<p>
These flags are passed to <em>git am</em> to easily change the dates
- of the rebased commits (see <a href="git-am.html">git-am(1)</a>).
+ of the rebased commits (see ).
Incompatible with the --interactive option.
</p>
</dd>
@@ -1161,7 +1161,7 @@ patience
to avoid mismerges that sometimes occur due to unimportant
matching lines (e.g., braces from distinct functions). Use
this when the branches to be merged have diverged wildly.
- See also <a href="git-diff.html">git-diff(1)</a> <tt>--patience</tt>.
+ See also <tt>--patience</tt>.
</p>
</dd>
<dt class="hdlist1">
@@ -1178,7 +1178,7 @@ ignore-space-at-eol
Treats lines with the indicated type of whitespace change as
unchanged for the sake of a three-way merge. Whitespace
changes mixed with other changes to a line are not ignored.
- See also <a href="git-diff.html">git-diff(1)</a> <tt>-b</tt>, <tt>-w</tt>, and
+ See also <tt>-b</tt>, <tt>-w</tt>, and
<tt>--ignore-space-at-eol</tt>.
</p>
<div class="ulist"><ul>
@@ -1211,7 +1211,7 @@ renormalize
meant to be used when merging branches with different clean
filters or end-of-line normalization rules. See "Merging
branches with differing checkin/checkout attributes" in
- <a href="gitattributes.html">gitattributes(5)</a> for details.
+ for details.
</p>
</dd>
<dt class="hdlist1">
@@ -1229,7 +1229,7 @@ rename-threshold=&lt;n&gt;
<dd>
<p>
Controls the similarity threshold used for rename detection.
- See also <a href="git-diff.html">git-diff(1)</a> <tt>-M</tt>.
+ See also <tt>-M</tt>.
</p>
</dd>
<dt class="hdlist1">
@@ -1605,7 +1605,7 @@ of the old <em>subsystem</em>, for example:</p></div>
<p>
With the <em>subsystem</em> reflog: after <em>git fetch</em>, the old tip of
<em>subsystem</em> is at <tt>subsystem@{1}</tt>. Subsequent fetches will
- increase the number. (See <a href="git-reflog.html">git-reflog(1)</a>.)
+ increase the number. (See .)
</p>
</li>
<li>
@@ -1651,13 +1651,13 @@ reorder commits tend to produce counterintuitive results.</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>
<div id="footer">
<div id="footer-text">
-Last updated 2012-04-30 15:35:49 PDT
+Last updated 2012-05-02 15:00:44 PDT
</div>
</div>
</body>