User Tools

Site Tools


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
Last revision Both sides next revision
git_rebase [2019/04/03 20:34]
rpjday [The fundamental rebase operation]
git_rebase [2019/04/06 21:32]
rpjday [Simple example]
Line 28: Line 28:
 ===== Examples ===== ===== Examples =====
  
-==== Example one ====+==== Simple example ​====
  
 <​code>​ <​code>​
Line 36: Line 36:
 </​code>​ </​code>​
  
 +One of:
 +
 +<​code>​
 +$ git checkout topic
 +$ git rebase master
 +</​code>​
 +
 +or:
 +
 +<​code>​
 $ git rebase master topic $ git rebase master topic
 +</​code>​
  
 <​code>​ <​code>​
Line 44: Line 55:
 </​code>​ </​code>​
  
-Example requiring ​''​%%--%%onto newbase'':​+==== Example requiring ​"--onto newbase" ====
  
 <​code>​ <​code>​
Line 53: 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 =====
git_rebase.txt · Last modified: 2019/04/06 21:34 by rpjday