André Luís 02 December 2014 Lovely overview! Thank you. One of the discoveries that changed my life (or at least I pulled a lot of less hairs off my head) was interacting rebasing with squashing and fixing up commits. It allows us to clean up the history of the (feature) branch before merging it into the master branch. Makes us a lot more confident while developing knowning the history is not final.