linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-06-05 05:03:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add git merge --continue

Browse source
This commit is contained in:
Tareq Al-Zubaidi 2018-06-05 10:28:02 +01:00
commit 749373ab60
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/git/git.plugin.zsh
View file

@ -193,6 +193,7 @@ alias gmt='git mergetool --no-prompt'
alias gmtvim='git mergetool --no-prompt --tool=vimdiff' alias gmtvim='git mergetool --no-prompt --tool=vimdiff'
alias gmum='git merge upstream/master' alias gmum='git merge upstream/master'
alias gma='git merge --abort' alias gma='git merge --abort'
alias gmc='git merge --continue'
alias gp='git push' alias gp='git push'
alias gpd='git push --dry-run' alias gpd='git push --dry-run'