From bd447639a960257155ed3e6eeab636f282bd72f9 Mon Sep 17 00:00:00 2001
From: typebrook <typebrook@gmail.com>
Date: Wed, 3 Apr 2019 11:05:29 +0800
Subject: update

---
 tigrc | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'tigrc')

diff --git a/tigrc b/tigrc
index 7bfca6f..4118346 100644
--- a/tigrc
+++ b/tigrc
@@ -135,17 +135,22 @@ bind blob m >tig %(file)
 bind status j :/^[MADRU?]
 bind status k :?^[MADRU?]
 
+# stash
 bind status s ?>git stash 
 bind status S @git stash push -m "%(prompt Enter stash name: )"
 bind status gs !git stashstaged
 bind status U !git checkout --patch -- %(file)
 
+# quick commit
 bind status c @git commit -m "%(prompt Enter commit message: )"
 bind status a ?>git commit --amend
 bind status p ?>sh -c "git commit -m 'update' && git push"
 
 bind status D ?>rm %(file)
 
+# solve conflict
+bind status Ra @git rebase --abort
+bind status Rc @git rebase --continue
 bind status <F4> !sh -c "git difftool -y \"$(git rev-parse --show-toplevel)/%(file)\""
 bind status Tu @git update-index --assume-unchanged %(file)
 
@@ -167,8 +172,8 @@ bind stash n @sh -c "git stash drop %(stash) | \
 #====================
 # stage view
 #====================
-bind stage n :/^@@
-bind stage p :?^@@
+bind stage <Ctrl-N> :/^@@
+bind stage <Ctrl-P> :?^@@
 bind stage <Esc>n :/^diff --(git|cc)
 bind stage <Esc>p :?^diff --(git|cc)
 
-- 
cgit v1.2.3-70-g09d2