<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">\r
<head>\r
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\r
-<meta name="generator" content="AsciiDoc 7.0.1" />\r
+<meta name="generator" content="AsciiDoc 7.0.2" />\r
<style type="text/css">\r
/* Debug borders */\r
p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {\r
</div>\r
<h2>SYNOPSIS</h2>\r
<div class="sectionbody">\r
-<p><em>git-rebase</em> <upstream> [<head>]</p>\r
+<p><em>git-rebase</em> [--onto <newbase>] <upstream> [<branch>]</p>\r
</div>\r
<h2>DESCRIPTION</h2>\r
<div class="sectionbody">\r
-<p>Rebases local commits to the new head of the upstream tree.</p>\r
+<p>git-rebase applies to <upstream> (or optionally to <newbase>) commits\r
+from <branch> that do not appear in <upstream>. When <branch> is not\r
+specified it defaults to the current branch (HEAD).</p>\r
+<p>When git-rebase is complete, <branch> will be updated to point to the\r
+newly created line of commit objects, so the previous line will not be\r
+accessible unless there are other references to it already.</p>\r
+<p>Assume the following history exists and the current branch is "topic":</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt> A---B---C topic\r
+ /\r
+D---E---F---G master</tt></pre>\r
+</div></div>\r
+<p>From this point, the result of the following commands:</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>git-rebase master\r
+git-rebase master topic</tt></pre>\r
+</div></div>\r
+<p>would be:</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt> A'--B'--C' topic\r
+ /\r
+D---E---F---G master</tt></pre>\r
+</div></div>\r
+<p>While, starting from the same point, the result of the following\r
+commands:</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt>git-rebase --onto master~1 master\r
+git-rebase --onto master~1 master topic</tt></pre>\r
+</div></div>\r
+<p>would be:</p>\r
+<div class="literalblock">\r
+<div class="content">\r
+<pre><tt> A'--B'--C' topic\r
+ /\r
+D---E---F---G master</tt></pre>\r
+</div></div>\r
</div>\r
<h2>OPTIONS</h2>\r
<div class="sectionbody">\r
<dl>\r
<dt>\r
+<newbase>\r
+</dt>\r
+<dd>\r
+<p>\r
+ Starting point at which to create the new commits. If the\r
+ --onto option is not specified, the starting point is\r
+ <upstream>.\r
+</p>\r
+</dd>\r
+<dt>\r
<upstream>\r
</dt>\r
<dd>\r
</div>\r
<div id="footer">\r
<div id="footer-text">\r
-Last updated 27-Dec-2005 00:16:32 PDT\r
+Last updated 22-Feb-2006 10:44:47 UTC\r
</div>\r
</div>\r
</body>\r
projects / git.git / blobdiff