diff --git a/bash/alias/git.sh b/bash/alias/git.sh index 7db6300..94ffd6c 100644 --- a/bash/alias/git.sh +++ b/bash/alias/git.sh @@ -212,20 +212,49 @@ alias glp='git log --all --graph \ # log medium information alias glm='git log --all --decorate --graph --pretty=medium' -# fast-forward to remote branch -alias gmf='git merge --ff-only' +# abort the current merge commit +alias gma="\ +git \ +merge \ +--abort \ +" # do a merge commit -alias gmc='git merge --no-ff -m' +alias gmc="\ +git \ +merge \ +--no-ff \ +-m \ +" -# abort the current merge commit -alias gma='git merge --abort' +# do a signed merge commit +alias gmcs="\ +git \ +merge \ +--no-ff \ +--gpg-sign \ +-m \ +" + +# fast-forward to remote branch +alias gmf="\ +git \ +merge \ +--ff-only \ +" # squash a branch and index its modifications -alias gms='git merge --squash' +alias gms="\ +git \ +merge \ +--squash \ +" # merge via external tool -alias gmt='git mergetool' +alias gmt="\ +git \ +mergetool \ +" # push to the remote repository alias gp="\