1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
\r
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
\r
3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
\r
5 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
\r
6 <meta name="generator" content="AsciiDoc 7.0.2" />
\r
7 <style type="text/css">
\r
9 p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
\r
11 border: 1px solid red;
\r
16 margin: 1em 5% 1em 5%;
\r
20 a:visited { color: fuchsia; }
\r
34 h1, h2, h3, h4, h5, h6 {
\r
36 font-family: sans-serif;
\r
38 margin-bottom: 0.5em;
\r
43 border-bottom: 2px solid silver;
\r
46 border-bottom: 2px solid silver;
\r
56 border: 1px solid silver;
\r
61 margin-bottom: 0.5em;
\r
71 font-family: sans-serif;
\r
78 font-family: sans-serif;
\r
82 font-family: sans-serif;
\r
84 border-top: 2px solid silver;
\r
90 padding-bottom: 0.5em;
\r
94 padding-bottom: 0.5em;
\r
98 div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
\r
99 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
\r
100 div.admonitionblock {
\r
103 margin-bottom: 1.5em;
\r
105 div.admonitionblock {
\r
107 margin-bottom: 2.5em;
\r
110 div.content { /* Block element content. */
\r
114 /* Block element titles. */
\r
115 div.title, caption.title {
\r
116 font-family: sans-serif;
\r
120 margin-bottom: 0.5em;
\r
126 td div.title:first-child {
\r
129 div.content div.title:first-child {
\r
132 div.content + div.title {
\r
136 div.sidebarblock > div.content {
\r
137 background: #ffffee;
\r
138 border: 1px solid silver;
\r
142 div.listingblock > div.content {
\r
143 border: 1px solid silver;
\r
144 background: #f4f4f4;
\r
148 div.quoteblock > div.content {
\r
149 padding-left: 2.0em;
\r
151 div.quoteblock .attribution {
\r
155 div.admonitionblock .icon {
\r
156 vertical-align: top;
\r
159 text-decoration: underline;
\r
161 padding-right: 0.5em;
\r
163 div.admonitionblock td.content {
\r
164 padding-left: 0.5em;
\r
165 border-left: 2px solid silver;
\r
168 div.exampleblock > div.content {
\r
169 border-left: 2px solid silver;
\r
173 div.verseblock div.content {
\r
177 div.imageblock div.content { padding-left: 0; }
\r
178 div.imageblock img { border: 1px solid silver; }
\r
179 span.image img { border-style: none; }
\r
183 margin-bottom: 0.8em;
\r
188 font-style: italic;
\r
190 dd > *:first-child {
\r
195 list-style-position: outside;
\r
198 list-style-type: lower-alpha;
\r
201 div.tableblock > table {
\r
202 border-color: #527bbd;
\r
206 font-family: sans-serif;
\r
215 margin-bottom: 0.8em;
\r
218 vertical-align: top;
\r
219 font-style: italic;
\r
220 padding-right: 0.8em;
\r
223 vertical-align: top;
\r
227 div#footer-badges { display: none; }
\r
229 include::./stylesheets/xhtml11-manpage.css[]
\r
230 /* Workarounds for IE6's broken and incomplete CSS2. */
\r
232 div.sidebar-content {
\r
233 background: #ffffee;
\r
234 border: 1px solid silver;
\r
237 div.sidebar-title, div.image-title {
\r
238 font-family: sans-serif;
\r
241 margin-bottom: 0.5em;
\r
244 div.listingblock div.content {
\r
245 border: 1px solid silver;
\r
246 background: #f4f4f4;
\r
250 div.quoteblock-content {
\r
251 padding-left: 2.0em;
\r
254 div.exampleblock-content {
\r
255 border-left: 2px solid silver;
\r
256 padding-left: 0.5em;
\r
259 <title>git-rebase(1)</title>
\r
264 git-rebase(1) Manual Page
\r
267 <div class="sectionbody">
\r
269 Rebase local commits to a new head
\r
274 <div class="sectionbody">
\r
275 <p><em>git-rebase</em> [--onto <newbase>] <upstream> [<branch>]</p>
\r
276 <p><em>git-rebase</em> --continue</p>
\r
277 <p><em>git-rebase</em> --abort</p>
\r
279 <h2>DESCRIPTION</h2>
\r
280 <div class="sectionbody">
\r
281 <p>git-rebase replaces <branch> with a new branch of the same name. When
\r
282 the --onto option is provided the new branch starts out with a HEAD equal
\r
283 to <newbase>, otherwise it is equal to <upstream>. It then attempts to
\r
284 create a new commit for each commit from the original <branch> that does
\r
285 not exist in the <upstream> branch.</p>
\r
286 <p>It is possible that a merge failure will prevent this process from being
\r
287 completely automatic. You will have to resolve any such merge failure
\r
288 and run <tt>git rebase --continue</tt>. If you can not resolve the merge
\r
289 failure, running <tt>git rebase --abort</tt> will restore the original <branch>
\r
290 and remove the working files found in the .dotest directory.</p>
\r
291 <p>Note that if <branch> is not specified on the command line, the currently
\r
292 checked out branch is used.</p>
\r
293 <p>Assume the following history exists and the current branch is "topic":</p>
\r
294 <div class="listingblock">
\r
295 <div class="content">
\r
296 <pre><tt> A---B---C topic
\r
298 D---E---F---G master</tt></pre>
\r
300 <p>From this point, the result of either of the following commands:</p>
\r
301 <div class="literalblock">
\r
302 <div class="content">
\r
303 <pre><tt>git-rebase master
\r
304 git-rebase master topic</tt></pre>
\r
307 <div class="listingblock">
\r
308 <div class="content">
\r
309 <pre><tt> A'--B'--C' topic
\r
311 D---E---F---G master</tt></pre>
\r
313 <p>While, starting from the same point, the result of either of the following
\r
315 <div class="literalblock">
\r
316 <div class="content">
\r
317 <pre><tt>git-rebase --onto master~1 master
\r
318 git-rebase --onto master~1 master topic</tt></pre>
\r
321 <div class="listingblock">
\r
322 <div class="content">
\r
323 <pre><tt> A'--B'--C' topic
\r
325 D---E---F---G master</tt></pre>
\r
327 <p>In case of conflict, git-rebase will stop at the first problematic commit
\r
328 and leave conflict markers in the tree. You can use git diff to locate
\r
329 the markers (<<<<<<) and make edits to resolve the conflict. For each
\r
330 file you edit, you need to tell git that the conflict has been resolved,
\r
331 typically this would be done with</p>
\r
332 <div class="literalblock">
\r
333 <div class="content">
\r
334 <pre><tt>git update-index <filename></tt></pre>
\r
336 <p>After resolving the conflict manually and updating the index with the
\r
337 desired resolution, you can continue the rebasing process with</p>
\r
338 <div class="literalblock">
\r
339 <div class="content">
\r
340 <pre><tt>git rebase --continue</tt></pre>
\r
342 <p>Alternatively, you can undo the git-rebase with</p>
\r
343 <div class="literalblock">
\r
344 <div class="content">
\r
345 <pre><tt>git rebase --abort</tt></pre>
\r
349 <div class="sectionbody">
\r
356 Starting point at which to create the new commits. If the
\r
357 --onto option is not specified, the starting point is
\r
366 Upstream branch to compare against.
\r
374 Working branch; defaults to HEAD.
\r
382 Restart the rebasing process after having resolved a merge conflict.
\r
390 Restore the original branch and abort the rebase operation.
\r
396 <div class="sectionbody">
\r
397 <p>When you rebase a branch, you are changing its history in a way that
\r
398 will cause problems for anyone who already has a copy of the branch
\r
399 in their repository and tries to pull updates from you. You should
\r
400 understand the implications of using <em>git rebase</em> on a repository that
\r
402 <p>When the git rebase command is run, it will first execute a "pre-rebase"
\r
403 hook if one exists. You can use this hook to do sanity checks and
\r
404 reject the rebase if it isn't appropriate. Please see the template
\r
405 pre-rebase hook script for an example.</p>
\r
406 <p>You must be in the top directory of your project to start (or continue)
\r
407 a rebase. Upon completion, <branch> will be the current branch.</p>
\r
410 <div class="sectionbody">
\r
411 <p>Written by Junio C Hamano <junkio@cox.net></p>
\r
413 <h2>Documentation</h2>
\r
414 <div class="sectionbody">
\r
415 <p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p>
\r
418 <div class="sectionbody">
\r
419 <p>Part of the <a href="git.html">git(7)</a> suite</p>
\r
422 <div id="footer-text">
\r
423 Last updated 02-May-2006 07:27:57 UTC
\r