diff options
| author | Junio C Hamano <junio@kernel.org> | 2010-11-06 01:01:59 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@kernel.org> | 2010-11-06 01:01:59 +0000 |
| commit | 68cf15a825368c926443c26a6516947fca3c1d39 (patch) | |
| tree | a587c9a51372746ddc3cdb08108bb14fb94a0488 /git-rebase.html | |
| parent | 39c7a69d994a13cbd5594bf2f5e65a0f21cc9bb9 (diff) | |
| download | git-htmldocs-68cf15a825368c926443c26a6516947fca3c1d39.tar.gz | |
Autogenerated HTML docs for v1.7.3.2-161-g3089c
Diffstat (limited to 'git-rebase.html')
| -rw-r--r-- | git-rebase.html | 472 |
1 files changed, 284 insertions, 188 deletions
diff --git a/git-rebase.html b/git-rebase.html index 526d8e5a5..6cabae5f1 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -3,7 +3,8 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.2.5" />
+<meta name="generator" content="AsciiDoc 8.4.5" />
+<title>git-rebase(1)</title>
<style type="text/css">
/* Debug borders */
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
@@ -26,10 +27,12 @@ a:visited { em {
font-style: italic;
+ color: navy;
}
strong {
font-weight: bold;
+ color: #083194;
}
tt {
@@ -71,6 +74,10 @@ p { margin-bottom: 0.5em;
}
+ul, ol, li > p {
+ margin-top: 0;
+}
+
pre {
padding: 0;
margin: 0;
@@ -84,7 +91,7 @@ span#author { }
span#email {
}
-span#revision {
+span#revnumber, span#revdate, span#revremark {
font-family: sans-serif;
}
@@ -104,11 +111,13 @@ div#footer-badges { padding-bottom: 0.5em;
}
-div#preamble,
+div#preamble {
+ margin-top: 1.5em;
+ margin-bottom: 1.5em;
+}
div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
div.admonitionblock {
- margin-right: 10%;
margin-top: 1.5em;
margin-bottom: 1.5em;
}
@@ -123,6 +132,7 @@ div.content { /* Block element content. */ /* Block element titles. */
div.title, caption.title {
+ color: #527bbd;
font-family: sans-serif;
font-weight: bold;
text-align: left;
@@ -149,22 +159,33 @@ div.sidebarblock > div.content { padding: 0.5em;
}
-div.listingblock {
- margin-right: 0%;
-}
div.listingblock > div.content {
border: 1px solid silver;
background: #f4f4f4;
padding: 0.5em;
}
-div.quoteblock > div.content {
+div.quoteblock {
padding-left: 2.0em;
+ margin-right: 10%;
}
-
-div.attribution {
+div.quoteblock > div.attribution {
+ padding-top: 0.5em;
text-align: right;
}
+
+div.verseblock {
+ padding-left: 2.0em;
+ margin-right: 10%;
+}
+div.verseblock > div.content {
+ white-space: pre;
+}
+div.verseblock > div.attribution {
+ padding-top: 0.75em;
+ text-align: left;
+}
+/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
div.verseblock + div.attribution {
text-align: left;
}
@@ -187,13 +208,9 @@ div.exampleblock > div.content { padding: 0.5em;
}
-div.verseblock div.content {
- white-space: pre;
-}
-
div.imageblock div.content { padding-left: 0; }
-div.imageblock img { border: 1px solid silver; }
span.image img { border-style: none; }
+a.image:visited { color: white; }
dl {
margin-top: 0.8em;
@@ -202,18 +219,38 @@ dl { dt {
margin-top: 0.5em;
margin-bottom: 0;
- font-style: italic;
+ font-style: normal;
+ color: navy;
}
dd > *:first-child {
- margin-top: 0;
+ margin-top: 0.1em;
}
ul, ol {
list-style-position: outside;
}
-div.olist2 ol {
+ol.arabic {
+ list-style-type: decimal;
+}
+ol.loweralpha {
list-style-type: lower-alpha;
}
+ol.upperalpha {
+ list-style-type: upper-alpha;
+}
+ol.lowerroman {
+ list-style-type: lower-roman;
+}
+ol.upperroman {
+ list-style-type: upper-roman;
+}
+
+div.compact ul, div.compact ol,
+div.compact p, div.compact p,
+div.compact div, div.compact div {
+ margin-top: 0.1em;
+ margin-bottom: 0.1em;
+}
div.tableblock > table {
border: 3px solid #527bbd;
@@ -225,22 +262,53 @@ thead { tfoot {
font-weight: bold;
}
+td > div.verse {
+ white-space: pre;
+}
+p.table {
+ margin-top: 0;
+}
+/* Because the table frame attribute is overriden by CSS in most browsers. */
+div.tableblock > table[frame="void"] {
+ border-style: none;
+}
+div.tableblock > table[frame="hsides"] {
+ border-left-style: none;
+ border-right-style: none;
+}
+div.tableblock > table[frame="vsides"] {
+ border-top-style: none;
+ border-bottom-style: none;
+}
+
-div.hlist {
+div.hdlist {
margin-top: 0.8em;
margin-bottom: 0.8em;
}
-div.hlist td {
- padding-bottom: 5px;
+div.hdlist tr {
+ padding-bottom: 15px;
}
-td.hlist1 {
+dt.hdlist1.strong, td.hdlist1.strong {
+ font-weight: bold;
+}
+td.hdlist1 {
vertical-align: top;
- font-style: italic;
+ font-style: normal;
padding-right: 0.8em;
+ color: navy;
}
-td.hlist2 {
+td.hdlist2 {
vertical-align: top;
}
+div.hdlist.compact tr {
+ margin: 0;
+ padding-bottom: 0;
+}
+
+.comment {
+ background: yellow;
+}
@media print {
div#footer-badges { display: none; }
@@ -271,7 +339,24 @@ div.toclevel4 { margin-left: 6em;
font-size: 0.9em;
}
-include1::./stylesheets/xhtml11-manpage.css[]
+/* Overrides for manpage documents */
+h1 {
+ padding-top: 0.5em;
+ padding-bottom: 0.5em;
+ border-top: 2px solid silver;
+ border-bottom: 2px solid silver;
+}
+h2 {
+ border-style: none;
+}
+div.sectionbody {
+ margin-left: 5%;
+}
+
+@media print {
+ div#toc { display: none; }
+}
+
/* Workarounds for IE6's broken and incomplete CSS2. */
div.sidebar-content {
@@ -280,6 +365,7 @@ div.sidebar-content { padding: 0.5em;
}
div.sidebar-title, div.image-title {
+ color: #527bbd;
font-family: sans-serif;
font-weight: bold;
margin-top: 0.0em;
@@ -292,8 +378,17 @@ div.listingblock div.content { padding: 0.5em;
}
-div.quoteblock-content {
- padding-left: 2.0em;
+div.quoteblock-attribution {
+ padding-top: 0.5em;
+ text-align: right;
+}
+
+div.verseblock-content {
+ white-space: pre;
+}
+div.verseblock-attribution {
+ padding-top: 0.75em;
+ text-align: left;
}
div.exampleblock-content {
@@ -304,7 +399,6 @@ div.exampleblock-content { /* IE6 sets dynamically generated links as visited. */
div#toc a:visited { color: blue; }
</style>
-<title>git-rebase(1)</title>
</head>
<body>
<div id="header">
@@ -318,65 +412,67 @@ git-rebase(1) Manual Page </p>
</div>
</div>
-<h2>SYNOPSIS</h2>
+<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<div class="content"><em>git rebase</em> [-i | --interactive] [options] [--onto <newbase>]
+<div class="verseblock-content"><em>git rebase</em> [-i | --interactive] [options] [--onto <newbase>]
<upstream> [<branch>]
<em>git rebase</em> [-i | --interactive] [options] --onto <newbase>
- --root [<branch>]</div></div>
-<div class="para"><p><em>git rebase</em> --continue | --skip | --abort</p></div>
+ --root [<branch>]</div>
+<div class="verseblock-attribution">
+</div></div>
+<div class="paragraph"><p><em>git rebase</em> --continue | --skip | --abort</p></div>
</div>
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
-<div class="para"><p>If <branch> is specified, <em>git rebase</em> will perform an automatic
+<div class="paragraph"><p>If <branch> is specified, <em>git rebase</em> will perform an automatic
<tt>git checkout <branch></tt> before doing anything else. Otherwise
it remains on the current branch.</p></div>
-<div class="para"><p>All changes made by commits in the current branch but that are not
+<div class="paragraph"><p>All changes made by commits in the current branch but that are not
in <upstream> are saved to a temporary area. This is the same set
of commits that would be shown by <tt>git log <upstream>..HEAD</tt> (or
<tt>git log HEAD</tt>, if --root is specified).</p></div>
-<div class="para"><p>The current branch is reset to <upstream>, or <newbase> if the
+<div class="paragraph"><p>The current branch is reset to <upstream>, or <newbase> if the
--onto option was supplied. This has the exact same effect as
<tt>git reset --hard <upstream></tt> (or <newbase>). ORIG_HEAD is set
to point at the tip of the branch before the reset.</p></div>
-<div class="para"><p>The commits that were previously saved into the temporary area are
+<div class="paragraph"><p>The commits that were previously saved into the temporary area are
then reapplied to the current branch, one by one, in order. Note that
any commits in HEAD which introduce the same textual changes as a commit
in HEAD..<upstream> are omitted (i.e., a patch already accepted upstream
with a different commit message or timestamp will be skipped).</p></div>
-<div class="para"><p>It is possible that a merge failure will prevent this process from being
+<div class="paragraph"><p>It is possible that a merge failure will prevent this process from being
completely automatic. You will have to resolve any such merge failure
and run <tt>git rebase --continue</tt>. Another option is to bypass the commit
that caused the merge failure with <tt>git rebase --skip</tt>. To restore the
original <branch> and remove the .git/rebase-apply working files, use the
command <tt>git rebase --abort</tt> instead.</p></div>
-<div class="para"><p>Assume the following history exists and the current branch is "topic":</p></div>
+<div class="paragraph"><p>Assume the following history exists and the current branch is "topic":</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> A---B---C topic
/
D---E---F---G master</tt></pre>
</div></div>
-<div class="para"><p>From this point, the result of either of the following commands:</p></div>
+<div class="paragraph"><p>From this point, the result of either of the following commands:</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>git rebase master
git rebase master topic</tt></pre>
</div></div>
-<div class="para"><p>would be:</p></div>
+<div class="paragraph"><p>would be:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> A'--B'--C' topic
/
D---E---F---G master</tt></pre>
</div></div>
-<div class="para"><p>The latter form is just a short-hand of <tt>git checkout topic</tt>
+<div class="paragraph"><p>The latter form is just a short-hand of <tt>git checkout topic</tt>
followed by <tt>git rebase master</tt>.</p></div>
-<div class="para"><p>If the upstream branch already contains a change you have made (e.g.,
+<div class="paragraph"><p>If the upstream branch already contains a change you have made (e.g.,
because you mailed a patch which was applied upstream), then that commit
-will be skipped. For example, running <tt>git rebase master</tt> on the
-following history (in which A' and A introduce the same set of changes,
+will be skipped. For example, running ‘git rebase master` on the
+following history (in which A’ and A introduce the same set of changes,
but have different committer information):</p></div>
<div class="listingblock">
<div class="content">
@@ -384,17 +480,17 @@ but have different committer information):</p></div> /
D---E---A'---F master</tt></pre>
</div></div>
-<div class="para"><p>will result in:</p></div>
+<div class="paragraph"><p>will result in:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> B'---C' topic
/
D---E---A'---F master</tt></pre>
</div></div>
-<div class="para"><p>Here is how you would transplant a topic branch based on one
+<div class="paragraph"><p>Here is how you would transplant a topic branch based on one
branch to another, to pretend that you forked the topic branch
from the latter branch, using <tt>rebase --onto</tt>.</p></div>
-<div class="para"><p>First let's assume your <em>topic</em> is based on branch <em>next</em>.
+<div class="paragraph"><p>First let’s assume your <em>topic</em> is based on branch <em>next</em>.
For example, a feature developed in <em>topic</em> depends on some
functionality which is found in <em>next</em>.</p></div>
<div class="listingblock">
@@ -405,7 +501,7 @@ functionality which is found in <em>next</em>.</p></div> \
o---o---o topic</tt></pre>
</div></div>
-<div class="para"><p>We want to make <em>topic</em> forked from branch <em>master</em>; for example,
+<div class="paragraph"><p>We want to make <em>topic</em> forked from branch <em>master</em>; for example,
because the functionality on which <em>topic</em> depends was merged into the
more stable <em>master</em> branch. We want our tree to look like this:</p></div>
<div class="listingblock">
@@ -416,12 +512,12 @@ more stable <em>master</em> branch. We want our tree to look like this:</p></div \
o---o---o---o---o next</tt></pre>
</div></div>
-<div class="para"><p>We can get this using the following command:</p></div>
+<div class="paragraph"><p>We can get this using the following command:</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>git rebase --onto master next topic</tt></pre>
</div></div>
-<div class="para"><p>Another example of --onto option is to rebase part of a
+<div class="paragraph"><p>Another example of --onto option is to rebase part of a
branch. If we have the following situation:</p></div>
<div class="listingblock">
<div class="content">
@@ -431,12 +527,12 @@ branch. If we have the following situation:</p></div> /
A---B---C---D master</tt></pre>
</div></div>
-<div class="para"><p>then the command</p></div>
+<div class="paragraph"><p>then the command</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>git rebase --onto master topicA topicB</tt></pre>
</div></div>
-<div class="para"><p>would result in:</p></div>
+<div class="paragraph"><p>would result in:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> H'--I'--J' topicB
@@ -445,27 +541,27 @@ branch. If we have the following situation:</p></div> |/
A---B---C---D master</tt></pre>
</div></div>
-<div class="para"><p>This is useful when topicB does not depend on topicA.</p></div>
-<div class="para"><p>A range of commits could also be removed with rebase. If we have
+<div class="paragraph"><p>This is useful when topicB does not depend on topicA.</p></div>
+<div class="paragraph"><p>A range of commits could also be removed with rebase. If we have
the following situation:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> E---F---G---H---I---J topicA</tt></pre>
</div></div>
-<div class="para"><p>then the command</p></div>
+<div class="paragraph"><p>then the command</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>git rebase --onto topicA~5 topicA~3 topicA</tt></pre>
</div></div>
-<div class="para"><p>would result in the removal of commits F and G:</p></div>
+<div class="paragraph"><p>would result in the removal of commits F and G:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> E---H'---I'---J' topicA</tt></pre>
</div></div>
-<div class="para"><p>This is useful if F and G were flawed in some way, or should not be
+<div class="paragraph"><p>This is useful if F and G were flawed in some way, or should not be
part of topicA. Note that the argument to --onto and the <upstream>
parameter can be any valid commit-ish.</p></div>
-<div class="para"><p>In case of conflict, <em>git rebase</em> will stop at the first problematic commit
+<div class="paragraph"><p>In case of conflict, <em>git rebase</em> will stop at the first problematic commit
and leave conflict markers in the tree. You can use <em>git diff</em> to locate
the markers (<<<<<<) and make edits to resolve the conflict. For each
file you edit, you need to tell git that the conflict has been resolved,
@@ -474,13 +570,13 @@ typically this would be done with</p></div> <div class="content">
<pre><tt>git add <filename></tt></pre>
</div></div>
-<div class="para"><p>After resolving the conflict manually and updating the index with the
+<div class="paragraph"><p>After resolving the conflict manually and updating the index with the
desired resolution, you can continue the rebasing process with</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>git rebase --continue</tt></pre>
</div></div>
-<div class="para"><p>Alternatively, you can undo the <em>git rebase</em> with</p></div>
+<div class="paragraph"><p>Alternatively, you can undo the <em>git rebase</em> with</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>git rebase --abort</tt></pre>
@@ -488,8 +584,8 @@ desired resolution, you can continue the rebasing process with</p></div> </div>
<h2 id="_configuration">CONFIGURATION</h2>
<div class="sectionbody">
-<div class="vlist"><dl>
-<dt>
+<div class="dlist"><dl>
+<dt class="hdlist1">
rebase.stat
</dt>
<dd>
@@ -498,7 +594,7 @@ rebase.stat rebase. False by default.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
rebase.autosquash
</dt>
<dd>
@@ -510,8 +606,8 @@ rebase.autosquash </div>
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
-<div class="vlist"><dl>
-<dt>
+<div class="dlist"><dl>
+<dt class="hdlist1">
<newbase>
</dt>
<dd>
@@ -521,11 +617,11 @@ rebase.autosquash <upstream>. May be any valid commit, and not just an
existing branch name.
</p>
-<div class="para"><p>As a special case, you may use "A...B" as a shortcut for the
+<div class="paragraph"><p>As a special case, you may use "A...B" as a shortcut for the
merge base of A and B if there is exactly one merge base. You can
leave out at most one of A and B, in which case it defaults to HEAD.</p></div>
</dd>
-<dt>
+<dt class="hdlist1">
<upstream>
</dt>
<dd>
@@ -534,7 +630,7 @@ leave out at most one of A and B, in which case it defaults to HEAD.</p></div> not just an existing branch name.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
<branch>
</dt>
<dd>
@@ -542,7 +638,7 @@ leave out at most one of A and B, in which case it defaults to HEAD.</p></div> Working branch; defaults to HEAD.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--continue
</dt>
<dd>
@@ -550,7 +646,7 @@ leave out at most one of A and B, in which case it defaults to HEAD.</p></div> Restart the rebasing process after having resolved a merge conflict.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--abort
</dt>
<dd>
@@ -558,7 +654,7 @@ leave out at most one of A and B, in which case it defaults to HEAD.</p></div> Restore the original branch and abort the rebase operation.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--skip
</dt>
<dd>
@@ -566,10 +662,10 @@ leave out at most one of A and B, in which case it defaults to HEAD.</p></div> Restart the rebasing process by skipping the current patch.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-m
</dt>
-<dt>
+<dt class="hdlist1">
--merge
</dt>
<dd>
@@ -578,16 +674,16 @@ leave out at most one of A and B, in which case it defaults to HEAD.</p></div> strategy is used, this allows rebase to be aware of renames on the
upstream side.
</p>
-<div class="para"><p>Note that a rebase merge works by replaying each commit from the working
+<div class="paragraph"><p>Note that a rebase merge works by replaying each commit from the working
branch on top of the <upstream> branch. Because of this, when a merge
conflict happens, the side reported as <em>ours</em> is the so-far rebased
series, starting with <upstream>, and <em>theirs</em> is the working branch. In
other words, the sides are swapped.</p></div>
</dd>
-<dt>
+<dt class="hdlist1">
-s <strategy>
</dt>
-<dt>
+<dt class="hdlist1">
--strategy=<strategy>
</dt>
<dd>
@@ -596,15 +692,15 @@ other words, the sides are swapped.</p></div> If there is no <tt>-s</tt> option <em>git merge-recursive</em> is used
instead. This implies --merge.
</p>
-<div class="para"><p>Because <em>git rebase</em> replays each commit from the working branch
+<div class="paragraph"><p>Because <em>git rebase</em> replays each commit from the working branch
on top of the <upstream> branch using the given strategy, using
the <em>ours</em> strategy simply discards all patches from the <branch>,
which makes little sense.</p></div>
</dd>
-<dt>
+<dt class="hdlist1">
-X <strategy-option>
</dt>
-<dt>
+<dt class="hdlist1">
--strategy-option=<strategy-option>
</dt>
<dd>
@@ -615,10 +711,10 @@ which makes little sense.</p></div> <em>theirs</em> as noted in above for the <tt>-m</tt> option.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-q
</dt>
-<dt>
+<dt class="hdlist1">
--quiet
</dt>
<dd>
@@ -626,10 +722,10 @@ which makes little sense.</p></div> Be quiet. Implies --no-stat.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-v
</dt>
-<dt>
+<dt class="hdlist1">
--verbose
</dt>
<dd>
@@ -637,7 +733,7 @@ which makes little sense.</p></div> Be verbose. Implies --stat.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--stat
</dt>
<dd>
@@ -646,10 +742,10 @@ which makes little sense.</p></div> diffstat is also controlled by the configuration option rebase.stat.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-n
</dt>
-<dt>
+<dt class="hdlist1">
--no-stat
</dt>
<dd>
@@ -657,7 +753,7 @@ which makes little sense.</p></div> Do not show a diffstat as part of the rebase process.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--no-verify
</dt>
<dd>
@@ -665,7 +761,7 @@ which makes little sense.</p></div> This option bypasses the pre-rebase hook. See also <a href="githooks.html">githooks(5)</a>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-C<n>
</dt>
<dd>
@@ -676,10 +772,10 @@ which makes little sense.</p></div> ever ignored.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-f
</dt>
-<dt>
+<dt class="hdlist1">
--force-rebase
</dt>
<dd>
@@ -690,16 +786,16 @@ which makes little sense.</p></div> situation.
Incompatible with the --interactive option.
</p>
-<div class="para"><p>You may find this (or --no-ff with an interactive rebase) helpful after
+<div class="paragraph"><p>You may find this (or --no-ff with an interactive rebase) helpful after
reverting a topic branch merge, as this option recreates the topic branch with
fresh commits so it can be remerged successfully without needing to "revert
the reversion" (see the
<a href="howto/revert-a-faulty-merge.txt">revert-a-faulty-merge How-To</a> for details).</p></div>
</dd>
-<dt>
+<dt class="hdlist1">
--ignore-whitespace
</dt>
-<dt>
+<dt class="hdlist1">
--whitespace=<option>
</dt>
<dd>
@@ -709,10 +805,10 @@ the reversion" (see the Incompatible with the --interactive option.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--committer-date-is-author-date
</dt>
-<dt>
+<dt class="hdlist1">
--ignore-date
</dt>
<dd>
@@ -722,10 +818,10 @@ the reversion" (see the Incompatible with the --interactive option.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-i
</dt>
-<dt>
+<dt class="hdlist1">
--interactive
</dt>
<dd>
@@ -735,21 +831,21 @@ the reversion" (see the split commits (see SPLITTING COMMITS below).
</p>
</dd>
-<dt>
+<dt class="hdlist1">
-p
</dt>
-<dt>
+<dt class="hdlist1">
--preserve-merges
</dt>
<dd>
<p>
Instead of ignoring merges, try to recreate them.
</p>
-<div class="para"><p>This uses the <tt>--interactive</tt> machinery internally, but combining it
+<div class="paragraph"><p>This uses the <tt>--interactive</tt> machinery internally, but combining it
with the <tt>--interactive</tt> option explicitly is generally not a good
idea unless you know what you are doing (see BUGS below).</p></div>
</dd>
-<dt>
+<dt class="hdlist1">
--root
</dt>
<dd>
@@ -763,10 +859,10 @@ idea unless you know what you are doing (see BUGS below).</p></div> instead.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
--autosquash
</dt>
-<dt>
+<dt class="hdlist1">
--no-autosquash
</dt>
<dd>
@@ -778,12 +874,12 @@ idea unless you know what you are doing (see BUGS below).</p></div> commit to be modified, and change the action of the moved
commit from <tt>pick</tt> to <tt>squash</tt> (or <tt>fixup</tt>).
</p>
-<div class="para"><p>This option is only valid when the <em>--interactive</em> option is used.</p></div>
-<div class="para"><p>If the <em>--autosquash</em> option is enabled by default using the
+<div class="paragraph"><p>This option is only valid when the <em>--interactive</em> option is used.</p></div>
+<div class="paragraph"><p>If the <em>--autosquash</em> option is enabled by default using the
configuration variable <tt>rebase.autosquash</tt>, this option can be
used to override and disable this setting.</p></div>
</dd>
-<dt>
+<dt class="hdlist1">
--no-ff
</dt>
<dd>
@@ -792,8 +888,8 @@ used to override and disable this setting.</p></div> fast-forwarding over the unchanged ones. This ensures that the
entire history of the rebased branch is composed of new commits.
</p>
-<div class="para"><p>Without --interactive, this is a synonym for --force-rebase.</p></div>
-<div class="para"><p>You may find this helpful after reverting a topic branch merge, as this option
+<div class="paragraph"><p>Without --interactive, this is a synonym for --force-rebase.</p></div>
+<div class="paragraph"><p>You may find this helpful after reverting a topic branch merge, as this option
recreates the topic branch with fresh commits so it can be remerged
successfully without needing to "revert the reversion" (see the
<a href="howto/revert-a-faulty-merge.txt">revert-a-faulty-merge How-To</a> for details).</p></div>
@@ -802,12 +898,12 @@ successfully without needing to "revert the reversion" (see the </div>
<h2 id="_merge_strategies">MERGE STRATEGIES</h2>
<div class="sectionbody">
-<div class="para"><p>The merge mechanism (<em>git-merge</em> and <em>git-pull</em> commands) allows the
+<div class="paragraph"><p>The merge mechanism (<em>git-merge</em> and <em>git-pull</em> commands) allows the
backend <em>merge strategies</em> to be chosen with <tt>-s</tt> option. Some strategies
can also take their own options, which can be passed by giving <tt>-X<option></tt>
arguments to <em>git-merge</em> and/or <em>git-pull</em>.</p></div>
-<div class="vlist"><dl>
-<dt>
+<div class="dlist"><dl>
+<dt class="hdlist1">
resolve
</dt>
<dd>
@@ -819,7 +915,7 @@ resolve fast.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
recursive
</dt>
<dd>
@@ -836,9 +932,9 @@ recursive renames. This is the default merge strategy when
pulling or merging one branch.
</p>
-<div class="para"><p>The <em>recursive</em> strategy can take the following options:</p></div>
-<div class="vlist"><dl>
-<dt>
+<div class="paragraph"><p>The <em>recursive</em> strategy can take the following options:</p></div>
+<div class="dlist"><dl>
+<dt class="hdlist1">
ours
</dt>
<dd>
@@ -847,11 +943,11 @@ ours favoring <em>our</em> version. Changes from the other tree that do not
conflict with our side are reflected to the merge result.
</p>
-<div class="para"><p>This should not be confused with the <em>ours</em> merge strategy, which does not
+<div class="paragraph"><p>This should not be confused with the <em>ours</em> merge strategy, which does not
even look at what the other tree contains at all. It discards everything
the other tree did, declaring <em>our</em> history contains all that happened in it.</p></div>
</dd>
-<dt>
+<dt class="hdlist1">
theirs
</dt>
<dd>
@@ -859,7 +955,7 @@ theirs This is opposite of <em>ours</em>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
patience
</dt>
<dd>
@@ -871,13 +967,13 @@ patience See also <a href="git-diff.html">git-diff(1)</a> <tt>--patience</tt>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
ignore-space-change
</dt>
-<dt>
+<dt class="hdlist1">
ignore-all-space
</dt>
-<dt>
+<dt class="hdlist1">
ignore-space-at-eol
</dt>
<dd>
@@ -888,7 +984,7 @@ ignore-space-at-eol See also <a href="git-diff.html">git-diff(1)</a> <tt>-b</tt>, <tt>-w</tt>, and
<tt>--ignore-space-at-eol</tt>.
</p>
-<div class="ilist"><ul>
+<div class="ulist"><ul>
<li>
<p>
If <em>their</em> version only introduces whitespace changes to a line,
@@ -908,7 +1004,7 @@ Otherwise, the merge proceeds in the usual way. </li>
</ul></div>
</dd>
-<dt>
+<dt class="hdlist1">
renormalize
</dt>
<dd>
@@ -921,7 +1017,7 @@ renormalize <a href="gitattributes.html">gitattributes(5)</a> for details.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
no-renormalize
</dt>
<dd>
@@ -930,7 +1026,7 @@ no-renormalize <tt>merge.renormalize</tt> configuration variable.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
rename-threshold=<n>
</dt>
<dd>
@@ -939,7 +1035,7 @@ rename-threshold=<n> See also <a href="git-diff.html">git-diff(1)</a> <tt>-M</tt>.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
subtree[=<path>]
</dt>
<dd>
@@ -953,7 +1049,7 @@ subtree[=<path>] </dd>
</dl></div>
</dd>
-<dt>
+<dt class="hdlist1">
octopus
</dt>
<dd>
@@ -965,7 +1061,7 @@ octopus pulling or merging more than one branch.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
ours
</dt>
<dd>
@@ -978,7 +1074,7 @@ ours the <em>recursive</em> merge strategy.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
subtree
</dt>
<dd>
@@ -994,22 +1090,22 @@ subtree </div>
<h2 id="_notes">NOTES</h2>
<div class="sectionbody">
-<div class="para"><p>You should understand the implications of using <em>git rebase</em> on a
+<div class="paragraph"><p>You should understand the implications of using <em>git rebase</em> on a
repository that you share. See also RECOVERING FROM UPSTREAM REBASE
below.</p></div>
-<div class="para"><p>When the git-rebase command is run, it will first execute a "pre-rebase"
+<div class="paragraph"><p>When the git-rebase command is run, it will first execute a "pre-rebase"
hook if one exists. You can use this hook to do sanity checks and
-reject the rebase if it isn't appropriate. Please see the template
+reject the rebase if it isn’t appropriate. Please see the template
pre-rebase hook script for an example.</p></div>
-<div class="para"><p>Upon completion, <branch> will be the current branch.</p></div>
+<div class="paragraph"><p>Upon completion, <branch> will be the current branch.</p></div>
</div>
<h2 id="_interactive_mode">INTERACTIVE MODE</h2>
<div class="sectionbody">
-<div class="para"><p>Rebasing interactively means that you have a chance to edit the commits
+<div class="paragraph"><p>Rebasing interactively means that you have a chance to edit the commits
which are rebased. You can reorder the commits, and you can
remove them (weeding out bad or otherwise unwanted patches).</p></div>
-<div class="para"><p>The interactive mode is meant for this type of workflow:</p></div>
-<div class="olist"><ol>
+<div class="paragraph"><p>The interactive mode is meant for this type of workflow:</p></div>
+<div class="olist arabic"><ol class="arabic">
<li>
<p>
have a wonderful idea
@@ -1031,13 +1127,13 @@ submit </p>
</li>
</ol></div>
-<div class="para"><p>where point 2. consists of several instances of</p></div>
-<div class="olist2"><ol>
+<div class="paragraph"><p>where point 2. consists of several instances of</p></div>
+<div class="olist loweralpha"><ol class="loweralpha">
<li>
<p>
regular use
</p>
-<div class="olist"><ol>
+<div class="olist arabic"><ol class="arabic">
<li>
<p>
finish something worthy of a commit
@@ -1054,7 +1150,7 @@ commit <p>
independent fixup
</p>
-<div class="olist"><ol>
+<div class="olist arabic"><ol class="arabic">
<li>
<p>
realize that something does not work
@@ -1073,19 +1169,19 @@ commit it </ol></div>
</li>
</ol></div>
-<div class="para"><p>Sometimes the thing fixed in b.2. cannot be amended to the not-quite
+<div class="paragraph"><p>Sometimes the thing fixed in b.2. cannot be amended to the not-quite
perfect commit it fixes, because that commit is buried deeply in a
patch series. That is exactly what interactive rebase is for: use it
after plenty of "a"s and "b"s, by rearranging and editing
commits, and squashing multiple commits into one.</p></div>
-<div class="para"><p>Start it with the last commit you want to retain as-is:</p></div>
+<div class="paragraph"><p>Start it with the last commit you want to retain as-is:</p></div>
<div class="literalblock">
<div class="content">
<pre><tt>git rebase -i <after-this-commit></tt></pre>
</div></div>
-<div class="para"><p>An editor will be fired up with all the commits in your current branch
+<div class="paragraph"><p>An editor will be fired up with all the commits in your current branch
(ignoring merge commits), which come after the given commit. You can
-reorder the commits in this list to your heart's content, and you can
+reorder the commits in this list to your heart’s content, and you can
remove them. The list looks more or less like this:</p></div>
<div class="listingblock">
<div class="content">
@@ -1093,34 +1189,34 @@ remove them. The list looks more or less like this:</p></div> pick fa1afe1 The oneline of the next commit
...</tt></pre>
</div></div>
-<div class="para"><p>The oneline descriptions are purely for your pleasure; <em>git rebase</em> will
+<div class="paragraph"><p>The oneline descriptions are purely for your pleasure; <em>git rebase</em> will
not look at them but at the commit names ("deadbee" and "fa1afe1" in this
example), so do not delete or edit the names.</p></div>
-<div class="para"><p>By replacing the command "pick" with the command "edit", you can tell
+<div class="paragraph"><p>By replacing the command "pick" with the command "edit", you can tell
<em>git rebase</em> to stop after applying that commit, so that you can edit
the files and/or the commit message, amend the commit, and continue
rebasing.</p></div>
-<div class="para"><p>If you just want to edit the commit message for a commit, replace the
+<div class="paragraph"><p>If you just want to edit the commit message for a commit, replace the
command "pick" with the command "reword".</p></div>
-<div class="para"><p>If you want to fold two or more commits into one, replace the command
+<div class="paragraph"><p>If you want to fold two or more commits into one, replace the command
"pick" for the second and subsequent commits with "squash" or "fixup".
If the commits had different authors, the folded commit will be
attributed to the author of the first commit. The suggested commit
message for the folded commit is the concatenation of the commit
messages of the first commit and of those with the "squash" command,
but omits the commit messages of commits with the "fixup" command.</p></div>
-<div class="para"><p><em>git rebase</em> will stop when "pick" has been replaced with "edit" or
+<div class="paragraph"><p><em>git rebase</em> will stop when "pick" has been replaced with "edit" or
when a command fails due to merge errors. When you are done editing
and/or resolving conflicts you can continue with <tt>git rebase --continue</tt>.</p></div>
-<div class="para"><p>For example, if you want to reorder the last 5 commits, such that what
+<div class="paragraph"><p>For example, if you want to reorder the last 5 commits, such that what
was HEAD~4 becomes the new HEAD. To achieve that, you would call
<em>git rebase</em> like this:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git rebase -i HEAD~5</tt></pre>
</div></div>
-<div class="para"><p>And move the first patch to the end of the list.</p></div>
-<div class="para"><p>You might want to preserve merges, if you have a history like this:</p></div>
+<div class="paragraph"><p>And move the first patch to the end of the list.</p></div>
+<div class="paragraph"><p>You might want to preserve merges, if you have a history like this:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> X
@@ -1129,13 +1225,13 @@ was HEAD~4 becomes the new HEAD. To achieve that, you would call /
---o---O---P---Q</tt></pre>
</div></div>
-<div class="para"><p>Suppose you want to rebase the side branch starting at "A" to "Q". Make
+<div class="paragraph"><p>Suppose you want to rebase the side branch starting at "A" to "Q". Make
sure that the current HEAD is "B", and call</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>$ git rebase -i -p --onto Q O</tt></pre>
</div></div>
-<div class="para"><p>Reordering and editing commits usually creates untested intermediate
+<div class="paragraph"><p>Reordering and editing commits usually creates untested intermediate
steps. You may want to check that your history editing did not break
anything by running a test, or at least recompiling at intermediate
points in history by using the "exec" command (shortcut "x"). You may
@@ -1150,21 +1246,21 @@ edit deadbab The oneline of the commit after exec cd subdir; make test
...</tt></pre>
</div></div>
-<div class="para"><p>The interactive rebase will stop when a command fails (i.e. exits with
+<div class="paragraph"><p>The interactive rebase will stop when a command fails (i.e. exits with
non-0 status) to give you an opportunity to fix the problem. You can
continue with <tt>git rebase --continue</tt>.</p></div>
-<div class="para"><p>The "exec" command launches the command in a shell (the one specified
+<div class="paragraph"><p>The "exec" command launches the command in a shell (the one specified
in <tt>$SHELL</tt>, or the default shell if <tt>$SHELL</tt> is not set), so you can
use shell features (like "cd", ">", ";" …). The command is run from
the root of the working tree.</p></div>
</div>
<h2 id="_splitting_commits">SPLITTING COMMITS</h2>
<div class="sectionbody">
-<div class="para"><p>In interactive mode, you can mark commits with the action "edit". However,
+<div class="paragraph"><p>In interactive mode, you can mark commits with the action "edit". However,
this does not necessarily mean that <em>git rebase</em> expects the result of this
edit to be exactly one commit. Indeed, you can undo the commit, or you can
add other commits. This can be used to split a commit into two:</p></div>
-<div class="ilist"><ul>
+<div class="ulist"><ul>
<li>
<p>
Start an interactive rebase with <tt>git rebase -i <commit>^</tt>, where
@@ -1208,19 +1304,19 @@ Continue the rebase with <tt>git rebase --continue</tt>. </p>
</li>
</ul></div>
-<div class="para"><p>If you are not absolutely sure that the intermediate revisions are
+<div class="paragraph"><p>If you are not absolutely sure that the intermediate revisions are
consistent (they compile, pass the testsuite, etc.) you should use
<em>git stash</em> to stash away the not-yet-committed changes
after each commit, test, and amend the commit if fixes are necessary.</p></div>
</div>
<h2 id="_recovering_from_upstream_rebase">RECOVERING FROM UPSTREAM REBASE</h2>
<div class="sectionbody">
-<div class="para"><p>Rebasing (or any other form of rewriting) a branch that others have
+<div class="paragraph"><p>Rebasing (or any other form of rewriting) a branch that others have
based work on is a bad idea: anyone downstream of it is forced to
manually fix their history. This section explains how to do the fix
-from the downstream's point of view. The real fix, however, would be
+from the downstream’s point of view. The real fix, however, would be
to avoid rebasing the upstream in the first place.</p></div>
-<div class="para"><p>To illustrate, suppose you are in a situation where someone develops a
+<div class="paragraph"><p>To illustrate, suppose you are in a situation where someone develops a
<em>subsystem</em> branch, and you are working on a <em>topic</em> that is dependent
on this <em>subsystem</em>. You might end up with a history like the
following:</p></div>
@@ -1232,7 +1328,7 @@ following:</p></div> \
*---*---* topic</tt></pre>
</div></div>
-<div class="para"><p>If <em>subsystem</em> is rebased against <em>master</em>, the following happens:</p></div>
+<div class="paragraph"><p>If <em>subsystem</em> is rebased against <em>master</em>, the following happens:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> o---o---o---o---o---o---o---o master
@@ -1241,7 +1337,7 @@ following:</p></div> \
*---*---* topic</tt></pre>
</div></div>
-<div class="para"><p>If you now continue development as usual, and eventually merge <em>topic</em>
+<div class="paragraph"><p>If you now continue development as usual, and eventually merge <em>topic</em>
to <em>subsystem</em>, the commits from <em>subsystem</em> will remain duplicated forever:</p></div>
<div class="listingblock">
<div class="content">
@@ -1251,14 +1347,14 @@ to <em>subsystem</em>, the commits from <em>subsystem</em> will remain duplicate \ /
*---*---*-..........-*--* topic</tt></pre>
</div></div>
-<div class="para"><p>Such duplicates are generally frowned upon because they clutter up
+<div class="paragraph"><p>Such duplicates are generally frowned upon because they clutter up
history, making it harder to follow. To clean things up, you need to
transplant the commits on <em>topic</em> to the new <em>subsystem</em> tip, i.e.,
rebase <em>topic</em>. This becomes a ripple effect: anyone downstream from
<em>topic</em> is forced to rebase too, and so on!</p></div>
-<div class="para"><p>There are two kinds of fixes, discussed in the following subsections:</p></div>
-<div class="vlist"><dl>
-<dt>
+<div class="paragraph"><p>There are two kinds of fixes, discussed in the following subsections:</p></div>
+<div class="dlist"><dl>
+<dt class="hdlist1">
Easy case: The changes are literally the same.
</dt>
<dd>
@@ -1267,7 +1363,7 @@ Easy case: The changes are literally the same. had no conflicts.
</p>
</dd>
-<dt>
+<dt class="hdlist1">
Hard case: The changes are not the same.
</dt>
<dd>
@@ -1280,17 +1376,17 @@ Hard case: The changes are not the same. </dd>
</dl></div>
<h3 id="_the_easy_case">The easy case</h3><div style="clear:left"></div>
-<div class="para"><p>Only works if the changes (patch IDs based on the diff contents) on
+<div class="paragraph"><p>Only works if the changes (patch IDs based on the diff contents) on
<em>subsystem</em> are literally the same before and after the rebase
<em>subsystem</em> did.</p></div>
-<div class="para"><p>In that case, the fix is easy because <em>git rebase</em> knows to skip
+<div class="paragraph"><p>In that case, the fix is easy because <em>git rebase</em> knows to skip
changes that are already present in the new upstream. So if you say
-(assuming you're on <em>topic</em>)</p></div>
+(assuming you’re on <em>topic</em>)</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> $ git rebase subsystem</tt></pre>
</div></div>
-<div class="para"><p>you will end up with the fixed history</p></div>
+<div class="paragraph"><p>you will end up with the fixed history</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> o---o---o---o---o---o---o---o master
@@ -1300,7 +1396,7 @@ changes that are already present in the new upstream. So if you say *---*---* topic</tt></pre>
</div></div>
<h3 id="_the_hard_case">The hard case</h3><div style="clear:left"></div>
-<div class="para"><p>Things get more complicated if the <em>subsystem</em> changes do not exactly
+<div class="paragraph"><p>Things get more complicated if the <em>subsystem</em> changes do not exactly
correspond to the ones before the rebase.</p></div>
<div class="admonitionblock">
<table><tr>
@@ -1310,14 +1406,14 @@ correspond to the ones before the rebase.</p></div> <td class="content">While an "easy case recovery" sometimes appears to be successful
even in the hard case, it may have unintended consequences. For
example, a commit that was removed via <tt>git rebase
- --interactive</tt> will be <strong>*resurrected</strong>*!</td>
+ --interactive</tt> will be <strong>resurrected</strong>!</td>
</tr></table>
</div>
-<div class="para"><p>The idea is to manually tell <em>git rebase</em> "where the old <em>subsystem</em>
+<div class="paragraph"><p>The idea is to manually tell <em>git rebase</em> "where the old <em>subsystem</em>
ended and your <em>topic</em> began", that is, what the old merge-base
between them was. You will have to find a way to name the last commit
of the old <em>subsystem</em>, for example:</p></div>
-<div class="ilist"><ul>
+<div class="ulist"><ul>
<li>
<p>
With the <em>subsystem</em> reflog: after <em>git fetch</em>, the old tip of
@@ -1332,33 +1428,33 @@ Relative to the tip of <em>topic</em>: knowing that your <em>topic</em> has thre </p>
</li>
</ul></div>
-<div class="para"><p>You can then transplant the old <tt>subsystem..topic</tt> to the new tip by
+<div class="paragraph"><p>You can then transplant the old <tt>subsystem..topic</tt> to the new tip by
saying (for the reflog case, and assuming you are on <em>topic</em> already):</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> $ git rebase --onto subsystem subsystem@{1}</tt></pre>
</div></div>
-<div class="para"><p>The ripple effect of a "hard case" recovery is especially bad:
+<div class="paragraph"><p>The ripple effect of a "hard case" recovery is especially bad:
<em>everyone</em> downstream from <em>topic</em> will now have to perform a "hard
case" recovery too!</p></div>
</div>
<h2 id="_bugs">BUGS</h2>
<div class="sectionbody">
-<div class="para"><p>The todo list presented by <tt>--preserve-merges --interactive</tt> does not
+<div class="paragraph"><p>The todo list presented by <tt>--preserve-merges --interactive</tt> does not
represent the topology of the revision graph. Editing commits and
rewording their commit messages should work fine, but attempts to
reorder commits tend to produce counterintuitive results.</p></div>
-<div class="para"><p>For example, an attempt to rearrange</p></div>
+<div class="paragraph"><p>For example, an attempt to rearrange</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>1 --- 2 --- 3 --- 4 --- 5</tt></pre>
</div></div>
-<div class="para"><p>to</p></div>
+<div class="paragraph"><p>to</p></div>
<div class="listingblock">
<div class="content">
<pre><tt>1 --- 2 --- 4 --- 3 --- 5</tt></pre>
</div></div>
-<div class="para"><p>by moving the "pick 4" line will result in the following history:</p></div>
+<div class="paragraph"><p>by moving the "pick 4" line will result in the following history:</p></div>
<div class="listingblock">
<div class="content">
<pre><tt> 3
@@ -1368,20 +1464,20 @@ reorder commits tend to produce counterintuitive results.</p></div> </div>
<h2 id="_authors">Authors</h2>
<div class="sectionbody">
-<div class="para"><p>Written by Junio C Hamano <gitster@pobox.com> and
-Johannes E. Schindelin <johannes.schindelin@gmx.de></p></div>
+<div class="paragraph"><p>Written by Junio C Hamano <<a href="mailto:gitster@pobox.com">gitster@pobox.com</a>> and
+Johannes E. Schindelin <<a href="mailto:johannes.schindelin@gmx.de">johannes.schindelin@gmx.de</a>></p></div>
</div>
<h2 id="_documentation">Documentation</h2>
<div class="sectionbody">
-<div class="para"><p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p></div>
+<div class="paragraph"><p>Documentation by Junio C Hamano and the git-list <<a href="mailto:git@vger.kernel.org">git@vger.kernel.org</a>>.</p></div>
</div>
<h2 id="_git">GIT</h2>
<div class="sectionbody">
-<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
+<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-10-27 06:08:21 UTC
+Last updated 2010-09-03 21:29:54 UTC
</div>
</div>
</body>
|