Interestingly, I would switched two of those commands around. NEVER EVER USE GIT MERGE! IT IS THE EVIL ONE! MERGE COMMITS ARE DEVILSPAWN AND MUCH BE CLEANSED W

Interestingly, I would switched two of those commands around. NEVER EVER USE GIT MERGE! IT IS THE EVIL ONE! MERGE COMMITS ARE DEVILSPAWN AND MUCH BE CLEANSED WITH FIRE!! Git rebase is great though, even if I usually prefer just to reset and cherry-pick. My and my gits are headless most of the time anyway.