I highly recommend being less bad at rebase - it's one of git's best features and actually pretty simple when you get the hang of it. Being able to completely

I highly recommend being less bad at rebase - it's one of git's best features and actually pretty simple when you get the hang of it. Being able to completely rewrite a feature branch at will before merging it (or rebasing or cherry picking or whatever) to master lets you go full on XCKD[1] with your commit messages but still compress them down to 1-2 logical "add change 1" "fix bug 2" commits at the end. Thinking about commit messages mid-flow isn't worth it ;) [1] https://xkcd.com/1296/ https://xkcd.com/1296/