Differences

This shows you the differences between two versions of the page.

--- git_rebase [2019/03/04 21:41] – created rpjday
+++ git_rebase [2019/04/06 21:34] (current) – [Removing a sequence of commits] rpjday
@@ Line 6: / Line 6: @@
 <code>
-git rebase [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]
+$ git rebase [-i | --interactive] [<options>]
-        [<upstream> [<branch>]]
+  [--exec <cmd>] [--onto <newbase>]
-git rebase [-i | --interactive] [<options>] [--exec <cmd>] [--onto <newbase>]
+  [<upstream> [<branch>]]
-        --root [<branch>]
-git rebase --continue | --skip | --abort | --quit | --edit-todo | --show-current-patch
+$ git rebase [-i | --interactive] [<options>]
+  [--exec <cmd>] [--onto <newbase>]
+  --root [<branch>]
+  -
+$ git rebase --continue | --skip | --abort | --quit |
+   --edit-todo | --show-current-patch
 </code>
-===== DESCRIPTION =====
+===== The fundamental rebase operation =====
+Three components define a rebase:
+  * the //branch// to be rebased
+  * the amount of that branch to be rebased
+  * the target //commit// onto which to rebase
+===== Examples =====
+==== Simple example ====
+<code>
+              A---B---C           topic
+             /
+        D---E---F---G             master
+</code>
+One of:
+<code>
+$ git checkout topic
+$ git rebase master
+</code>
+or:
+<code>
+$ git rebase master topic
+</code>
+<code>
+                      A'--B'--C'  topic
+                     /
+        D---E---F---G             master
+</code>
+==== Example requiring "--onto newbase" ====
+<code>
+        o---o---o---o---o  master
+             \
+              o---o---o---o---o  next
+                       \
+                        o---o---o  topic
+</code>
+<code>
+$ git rebase --onto master next topic
+</code>
+<code>
+                          o---o---o  topic
+                         /
+        o---o---o---o---o  master
+             \
+              o---o---o---o---o  next
+</code>
+==== Removing a sequence of commits =====
+Given:
+<code>
+A <--- B <--- C <--- D <--- E <--- F  [HEAD]
+</code>
+we could remove C and D with:
+<code>
+$ git rebase --onto B D [HEAD]
+</code>
+to get:
 <code>
-If <branch> is specified, git rebase will perform an automatic
+A <--- B <--- E' <--- F'  [HEAD]
-git checkout <branch> before doing anything else. Otherwise it
-remains on the current branch.
 </code>