From 5b31dda7c991fe928fe615153e17230ceaf94e1d Mon Sep 17 00:00:00 2001
From: typebrook <typebrook@gmail.com>
Date: Sat, 14 Mar 2020 13:24:49 +0800
Subject: update

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

(limited to 'tigrc')

diff --git a/tigrc b/tigrc
index f3ad7a6..26c96c3 100644
--- a/tigrc
+++ b/tigrc
@@ -127,6 +127,7 @@ bind main m ?@git merge %(commit)
 bind main M ?@git merge %(branch) --no-ff
 bind main gm ?@git merge %(remote)/%(branch)         # merge with current remote
 bind main gM ?@git merge %(remote)/%(branch) --no-ff # merge-no-ff with current remote
+bind main gs ?@git merge %(branch) --squash
 
 # push
 bind main p none # override default pager binding
-- 
cgit v1.2.3-70-g09d2