mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2026-06-05 05:03:16 +02:00
Add git merge --continue
This commit is contained in:
parent
62b8a70a7c
commit
749373ab60
1 changed files with 1 additions and 0 deletions
|
|
@ -193,6 +193,7 @@ alias gmt='git mergetool --no-prompt'
|
|||
alias gmtvim='git mergetool --no-prompt --tool=vimdiff'
|
||||
alias gmum='git merge upstream/master'
|
||||
alias gma='git merge --abort'
|
||||
alias gmc='git merge --continue'
|
||||
|
||||
alias gp='git push'
|
||||
alias gpd='git push --dry-run'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue