Add -p to some rebase git aliases and resync gitconfig-amazon with gitconfig.