1
0
mirror of https://github.com/robbyrussell/oh-my-zsh.git synced 2025-12-16 04:10:42 +01:00

added git merge abort

Jonathan Wood
2019-01-16 09:28:52 +00:00
parent 227634e281
commit afc0a14ded

@@ -156,6 +156,7 @@ alias -g gp='| grep -i' #creates a global alias for grep
| _glog_ | git log --oneline --decorate --color --graph |
| _glp_ | _git_log_prettily (git log --pretty=$1) |
| _gm_ | git merge |
| _gma_ | git merge --abort |
| _gmt_ | git mergetool --no-prompt |
| _gp_ | git push |
| _gpoat_ | git push origin --all && git push origin --tags |