change history with git
Post on 07-May-2015
1.516 Views
Preview:
DESCRIPTION
TRANSCRIPT
Change History With Gitusing rebase to maintain sanity
Integrating changes across branches
mergeJoin two or more
development histories together
mergeJoin two or more
development histories together
merge madness
rebase Forward-port local commits
to the updated upstream head
rebase Forward-port local commits
to the updated upstream head
rebase sanity
Changing history withgit rebase interactive mode
interactive mode
• reorder
• edit
• drop
• squash
• split
interactive mode
$ git checkout my_feature_branch
$ git rebase --interactive master
changing history
$ git checkout master
$ git rebase --interactive e0a3a3
Warning!
• BAD for pushed commits
Resources
• screencast: http://peepcode.com/products/git
• gitx: http://gitx.frim.nl
top related