Pimp your git workflow. Stop using command-combo-hell and just type pull, branch, merge, push