Add git cherrypick alias and git rebase skip