diff --git a/shell/alias/git.sh b/shell/alias/git.sh index 61188ed..57c897c 100644 --- a/shell/alias/git.sh +++ b/shell/alias/git.sh @@ -294,39 +294,44 @@ glp() { } # abort the current merge commit -alias gma="\ -git \ -merge \ ---abort \ -" +gma() { + git \ + merge \ + --abort \ + "${@}" +} # do a merge commit -alias gmc="\ -git \ -merge \ ---no-ff \ ---message \ -" +gmc() { + git \ + merge \ + --no-ff \ + --message \ + "${@}" +} # fast-forward to remote branch -alias gmf="\ -git \ -merge \ ---ff-only \ -" +gmf() { + git \ + merge \ + --ff-only \ + "${@}" +} # squash a branch and index its modifications -alias gms="\ -git \ -merge \ ---squash \ -" +gms() { + git \ + merge \ + --squash \ + "${@}" +} # merge via external tool -alias gmt="\ -git \ -mergetool \ -" +gmt() { + git \ + mergetool \ + "${@}" +} # push to the remote repository alias gp="\