added shortcuts for git, fish
few more shortcuts to git
fixing merge conflict
pushom, pullom