Marko Prelec

Blog

Rebase and Squash Branch

1. on “test” branch.
2. git rebase -i master (don’t pull at that point)
3. squash (if necessary solve the conflicts)
4. on “master” branch use git rebase test
5. git branch -D test
6. delete also remote branch git push origin --delete test

*replace “test” with your branch.

Bisect

Great (or maybe the best) way to crawl through the commits until you find the error.

git bisect start
git bisect good (until there is a bad one)
git bisect bad
git bisect reset (when you are done)

Source