diff --git a/bash/aliases b/bash/aliases index c60923a..c77405e 100644 --- a/bash/aliases +++ b/bash/aliases @@ -14,6 +14,7 @@ alias gpush='git push' alias gpull='git pull --ff-only' alias gfetch='git fetch' alias gdiff='git diff' +alias gmerge='git merge --ff-only' alias merged?='git branch --merged' alias gbd='git branch -d' alias gpush!='git push -u origin `git rev-parse --abbrev-ref HEAD`'