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 new upstream head
\r
274 <div class="sectionbody">
\r
275 <p><em>git-rebase</em> [--onto <newbase>] <upstream> [<branch>]</p>
\r
277 <h2>DESCRIPTION</h2>
\r
278 <div class="sectionbody">
\r
279 <p>git-rebase applies to <upstream> (or optionally to <newbase>) commits
\r
280 from <branch> that do not appear in <upstream>. When <branch> is not
\r
281 specified it defaults to the current branch (HEAD).</p>
\r
282 <p>When git-rebase is complete, <branch> will be updated to point to the
\r
283 newly created line of commit objects, so the previous line will not be
\r
284 accessible unless there are other references to it already.</p>
\r
285 <p>Assume the following history exists and the current branch is "topic":</p>
\r
286 <div class="literalblock">
\r
287 <div class="content">
\r
288 <pre><tt> A---B---C topic
\r
290 D---E---F---G master</tt></pre>
\r
292 <p>From this point, the result of either of the following commands:</p>
\r
293 <div class="literalblock">
\r
294 <div class="content">
\r
295 <pre><tt>git-rebase master
\r
296 git-rebase master topic</tt></pre>
\r
299 <div class="literalblock">
\r
300 <div class="content">
\r
301 <pre><tt> A'--B'--C' topic
\r
303 D---E---F---G master</tt></pre>
\r
305 <p>While, starting from the same point, the result of either of the following
\r
307 <div class="literalblock">
\r
308 <div class="content">
\r
309 <pre><tt>git-rebase --onto master~1 master
\r
310 git-rebase --onto master~1 master topic</tt></pre>
\r
313 <div class="literalblock">
\r
314 <div class="content">
\r
315 <pre><tt> A'--B'--C' topic
\r
317 D---E---F---G master</tt></pre>
\r
321 <div class="sectionbody">
\r
328 Starting point at which to create the new commits. If the
\r
329 --onto option is not specified, the starting point is
\r
338 Upstream branch to compare against.
\r
346 Working branch; defaults to HEAD.
\r
352 <div class="sectionbody">
\r
353 <p>Written by Junio C Hamano <junkio@cox.net></p>
\r
355 <h2>Documentation</h2>
\r
356 <div class="sectionbody">
\r
357 <p>Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.</p>
\r
360 <div class="sectionbody">
\r
361 <p>Part of the <a href="git.html">git(7)</a> suite</p>
\r
364 <div id="footer-text">
\r
365 Last updated 18-Mar-2006 07:45:36 UTC
\r