change history with git
DESCRIPTION
Using rebase to maintain sanityTRANSCRIPT
![Page 1: Change history with Git](https://reader033.vdocuments.net/reader033/viewer/2022052821/554a51c9b4c90531228b4b4c/html5/thumbnails/1.jpg)
Change History With Gitusing rebase to maintain sanity
![Page 2: Change history with Git](https://reader033.vdocuments.net/reader033/viewer/2022052821/554a51c9b4c90531228b4b4c/html5/thumbnails/2.jpg)
Integrating changes across branches
![Page 3: Change history with Git](https://reader033.vdocuments.net/reader033/viewer/2022052821/554a51c9b4c90531228b4b4c/html5/thumbnails/3.jpg)
mergeJoin two or more
development histories together
![Page 4: Change history with Git](https://reader033.vdocuments.net/reader033/viewer/2022052821/554a51c9b4c90531228b4b4c/html5/thumbnails/4.jpg)
mergeJoin two or more
development histories together
![Page 5: Change history with Git](https://reader033.vdocuments.net/reader033/viewer/2022052821/554a51c9b4c90531228b4b4c/html5/thumbnails/5.jpg)
merge madness
![Page 6: Change history with Git](https://reader033.vdocuments.net/reader033/viewer/2022052821/554a51c9b4c90531228b4b4c/html5/thumbnails/6.jpg)
rebase Forward-port local commits
to the updated upstream head
![Page 7: Change history with Git](https://reader033.vdocuments.net/reader033/viewer/2022052821/554a51c9b4c90531228b4b4c/html5/thumbnails/7.jpg)
rebase Forward-port local commits
to the updated upstream head
![Page 8: Change history with Git](https://reader033.vdocuments.net/reader033/viewer/2022052821/554a51c9b4c90531228b4b4c/html5/thumbnails/8.jpg)
rebase sanity
![Page 9: Change history with Git](https://reader033.vdocuments.net/reader033/viewer/2022052821/554a51c9b4c90531228b4b4c/html5/thumbnails/9.jpg)
Changing history withgit rebase interactive mode
![Page 10: Change history with Git](https://reader033.vdocuments.net/reader033/viewer/2022052821/554a51c9b4c90531228b4b4c/html5/thumbnails/10.jpg)
interactive mode
• reorder
• edit
• drop
• squash
• split
![Page 11: Change history with Git](https://reader033.vdocuments.net/reader033/viewer/2022052821/554a51c9b4c90531228b4b4c/html5/thumbnails/11.jpg)
interactive mode
$ git checkout my_feature_branch
$ git rebase --interactive master
![Page 12: Change history with Git](https://reader033.vdocuments.net/reader033/viewer/2022052821/554a51c9b4c90531228b4b4c/html5/thumbnails/12.jpg)
changing history
$ git checkout master
$ git rebase --interactive e0a3a3
![Page 13: Change history with Git](https://reader033.vdocuments.net/reader033/viewer/2022052821/554a51c9b4c90531228b4b4c/html5/thumbnails/13.jpg)
Warning!
• BAD for pushed commits
![Page 14: Change history with Git](https://reader033.vdocuments.net/reader033/viewer/2022052821/554a51c9b4c90531228b4b4c/html5/thumbnails/14.jpg)
Resources
• screencast: http://peepcode.com/products/git
• gitx: http://gitx.frim.nl