diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 34598fb35..74b9d6c58 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -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'