Add git merge and rebase alias