Change history with Git

1,828 views
1,730 views

Published on

Using rebase to maintain sanity

Published in: Technology
0 Comments
2 Likes
Statistics
Notes
  • Be the first to comment

No Downloads
Views
Total views
1,828
On SlideShare
0
From Embeds
0
Number of Embeds
15
Actions
Shares
0
Downloads
15
Comments
0
Likes
2
Embeds 0
No embeds

No notes for slide

Change history with Git

  1. 1. Change History With Git using rebase to maintain sanity
  2. 2. Integrating changes across branches
  3. 3. merge Join two or moredevelopment histories together
  4. 4. merge Join two or moredevelopment histories together
  5. 5. merge madness
  6. 6. rebaseForward-port local commits to the updated upstream head
  7. 7. rebaseForward-port local commits to the updated upstream head
  8. 8. rebase sanity
  9. 9. Changing history withgit rebase interactive mode
  10. 10. interactive mode• reorder• edit• drop• squash• split
  11. 11. interactive mode$ git checkout my_feature_branch$ git rebase --interactive master
  12. 12. changing history$ git checkout master$ git rebase --interactive e0a3a3
  13. 13. Warning!• BAD for pushed commits
  14. 14. Resources• screencast: http://peepcode.com/products/git• gitx: http://gitx.frim.nl

×