From afffcbc87a289ac03e7b9a42e731e27398cbdded Mon Sep 17 00:00:00 2001
From: Ruppal Singh <ruppalsingh.dv@gmail.com>
Date: Thu, 7 Dec 2017 10:53:50 +0530
Subject: [PATCH] Add alias for no-fastforward merge to Git plugin

---
 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 fa0c06500..db25906e1 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -188,6 +188,7 @@ alias glp="_git_log_prettily"
 compdef _git glp=git-log
 
 alias gm='git merge'
+alias gmnf='git merge --no-ff'
 alias gmom='git merge origin/master'
 alias gmt='git mergetool --no-prompt'
 alias gmtvim='git mergetool --no-prompt --tool=vimdiff'