From 91b48718d1717d51d07d4702ff6d850a3f5da7b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denny=20Sch=C3=A4fer?= <d.schaefer@cevo.de>
Date: Wed, 18 Sep 2013 15:56:32 +0200
Subject: [PATCH] Addd gmnff gmff alias for git merge --no-ff and --ff

---
 git.scmbrc.example | 2 ++
 lib/git/aliases.sh | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/git.scmbrc.example b/git.scmbrc.example
index 94321aa..cc822fe 100644
--- a/git.scmbrc.example
+++ b/git.scmbrc.example
@@ -81,6 +81,8 @@ git_rebase_alias_continue="grbc"
 git_rebase_alias_abort="grba"
 git_reset_last_commit="grsl"
 git_merge_alias="gm"
+git_merge_no_fast_forward_alias="gmnff"
+git_merge_only_fast_forward_alias="gmff"
 git_cherry_pick_alias="gcp"
 git_log_alias="gl"
 git_log_stat_alias="gls"
diff --git a/lib/git/aliases.sh b/lib/git/aliases.sh
index a1f7762..cbc1404 100644
--- a/lib/git/aliases.sh
+++ b/lib/git/aliases.sh
@@ -121,6 +121,8 @@ if [ "$git_setup_aliases" = "yes" ]; then
   __git_alias "$git_rebase_alias_abort" "git" 'rebase' "--abort"
   __git_alias "$git_reset_last_commit" "git" "reset HEAD~"
   __git_alias "$git_merge_alias" "git" 'merge'
+  __git_alias "$git_merge_no_fast_forward_alias" "git" "merge" "--no-ff"
+  __git_alias "$git_merge_only_fast_forward_alias" "git" "merge" "--ff"
   __git_alias "$git_cherry_pick_alias" "git" 'cherry-pick'
   __git_alias "$git_show_alias" "git" 'show'
   __git_alias "$git_show_summary" "git" 'show' '--summary'