From 27bbb5ddc0bc40c14c74b5041b88156d424bf2da Mon Sep 17 00:00:00 2001
From: Cyril Auburtin <cyril.auburtin@gmail.com>
Date: Fri, 8 Jun 2018 21:03:01 +0200
Subject: [PATCH] gmf for merge --ff-only

---
 plugins/git/git.plugin.zsh | 1 +
 1 file changed, 1 insertion(+)

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'