Add merge command

This is my last frequently used command. My next pull request will be a 'combo' command to commit, merge, tag and push (all-in-one).