Just a short note about the useful git aliases I’ve came up with during the course of my daily work with git and github.
git
As it happened, I managed to merge a feature branch into our mainline that was not completely finished. After trying to fix it directly in the mainline I figured out that the best thing to do is to revert my changes in master and continue in a feature branch.