gitconfig: add fixup alias
zshrc: add merge() and pull_request() bash methods