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

Add alias for no-fastforward merge to Git plugin

Browse source
This commit is contained in:
Ruppal Singh 2017-12-07 10:53:50 +05:30
commit afffcbc87a
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

@ -188,6 +188,7 @@ alias glp="_git_log_prettily"
compdef _git glp=git-log
alias gm='git merge'
alias gmnf='git merge --no-ff'
alias gmom='git merge origin/master'
alias gmt='git mergetool --no-prompt'
alias gmtvim='git mergetool --no-prompt --tool=vimdiff'