git_rebase

Differences

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

Link to this comparison view

Both sides previous revision Previous revision
Next revision		 Previous revision
git_rebase [2019/04/03 20:37] – [Example one] rpjdaygit_rebase [2019/04/06 21:34] (current) – [Removing a sequence of commits] rpjday
Line 28: Line 28:
 ===== Examples ===== ===== Examples =====
  
-==== Example one ====+==== Simple example ====
  
 <code> <code>
Line 35: Line 35:
         D---E---F---G             master         D---E---F---G             master
 </code> </code>
 +
 +One of:
 +
 +<code>
 +$ git checkout topic
 +$ git rebase master
 +</code>
 +
 +or:
  
 <code> <code>
Line 46: Line 55:
 </code> </code>
  
-==== Example requiring ''%%--%%onto newbase'' ====+==== Example requiring "--onto newbase" ====
  
 <code> <code>
Line 55: Line 64:
                         o---o---o  topic                         o---o---o  topic
 </code> </code>
-===== DESCRIPTION ===== 
  
 <code> <code>
-If <branch> is specified, git rebase will perform an automatic +$ git rebase --onto master next topic
-git checkout <branch> before doing anything else. Otherwise it +
-remains on the current branch.+
 </code> </code>
- 
-In other words, the final optional argument ''[branch]'' can always be omitted if you first just: 
  
 <code> <code>
-$ git checkout <branch>+                          o---o---o  topic 
 +                         / 
 +        o---o---o---o---o  master 
 +             \ 
 +              o---o---o---o---o  next
 </code> </code>
  
-then just pretend it says ''HEAD''. 
  
-===== Examples ===== 
  
 ==== Removing a sequence of commits ===== ==== Removing a sequence of commits =====
Line 84: Line 90:
  
 <code> <code>
-$ git rebase --onto B D+$ git rebase --onto B D [HEAD]
 </code> </code>
  
  • git_rebase.1554323859.txt.gz
  • Last modified: 2019/04/03 20:37
  • by rpjday