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

gmf for merge --ff-only

Browse source
This commit is contained in:
Cyril Auburtin 2018-06-08 21:03:01 +02:00 • committed by GitHub
commit 27bbb5ddc0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

@ -195,6 +195,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 gmf='git merge --ff-only'
alias gp='git push'
alias gpd='git push --dry-run'