obscuren/rebase onto.md

Last active March 23, 2016 13:32

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/obscuren/b719b47d9f6966a8d159.js"></script>
Save obscuren/b719b47d9f6966a8d159 to your computer and use it in GitHub Desktop.

Raw

Good!

A - B - C - D     <develop>
             \
              E - F - G     <PR1>
                       \
                        H - I - J     <PR2>

Diverged!

A - B - C - D     <develop>
             \
              E - F - G     <PR1>
	               
              E' - F' - G' - H - I - J     <PR2>

Want to get rid of E', F', G', they are out of date.

git rebase --onto <new base> <old base>. We want to rebase using new base PR1 and keep H, I, J (H~4): git rebase --onto P1 HEAD~4