From e1d87789d2be3cca67f87b77a76821089eb67c5b Mon Sep 17 00:00:00 2001
From: typebrook <typebrook@gmail.com>
Date: Thu, 30 Jan 2020 16:27:57 +0800
Subject: update

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

(limited to 'tigrc')

diff --git a/tigrc b/tigrc
index 6833f5a..441a6cb 100644
--- a/tigrc
+++ b/tigrc
@@ -144,7 +144,7 @@ bind main pU ?git pull --rebase
 bind main uu ?git reset %(commit) --soft
 bind main uh ?git reset %(commit) --hard
 bind main uS ?sh -c "git reset %(commit) && git stash push -m 'deprecated from reset'" # reset and stash the changes
-bind main B !?git rebase -i %(commit)
+bind main B !?git rebase --rebase-merges -i %(commit)
 bind main gb !?git rebase --onto '%(prompt Rebase onto which branch? )' %(commit) %(repo:head)
 bind main ! ?git revert %(commit)
 
-- 
cgit v1.2.3-70-g09d2