From 9059358c6a5c90898441699e4026f54bdd4671fb Mon Sep 17 00:00:00 2001
From: typebrook <typebrook@gmail.com>
Date: Tue, 12 Mar 2019 18:11:07 +0800
Subject: update

---
 tigrc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tigrc')

diff --git a/tigrc b/tigrc
index fcdc1e0..5356efc 100644
--- a/tigrc
+++ b/tigrc
@@ -27,6 +27,7 @@ bind main T @git tag "%(prompt Enter tag name: )" %(commit)
 bind main gdt @git tag -d %(tag)
 bind main <Ctrl-r> !?git rebase -i %(commit)
 bind main m ?git merge %(commit)
+bind main M ?git merge %(commit) --no-ff
 bind main P ?git push
 bind main b @git checkout -b "%(prompt Enter branch name: )"
 bind main B !sh scripts/bump_version.sh
-- 
cgit v1.2.3-70-g09d2