From af621691177d42e8c939ba33eb464b0b82c33cd3 Mon Sep 17 00:00:00 2001 From: typebrook Date: Mon, 8 Apr 2019 18:08:33 +0800 Subject: update --- gitconfig | 3 +++ tigrc | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gitconfig b/gitconfig index c9799e7..2b011fc 100644 --- a/gitconfig +++ b/gitconfig @@ -13,5 +13,8 @@ [core] pager = +[merge] + tool = vimdiff + [color] ui = off diff --git a/tigrc b/tigrc index db4aa62..eeaff52 100644 --- a/tigrc +++ b/tigrc @@ -167,6 +167,7 @@ bind status ?git am %(file) #==================== bind stash a ?git stash apply %(stash) bind stash d ?>git stash drop %(stash) +bind stash p ?>git stash pop %(stash) # rename a stash bind stash n @sh -c "git stash drop %(stash) | \ @@ -220,8 +221,8 @@ bind refs > >sh -c "git diff %(branch) --prefix -U1000 | tig" #==================== # log view #==================== -bind log n :/^commit -bind log p :?^commit +bind log :/^commit +bind log :?^commit #==================== # diff view -- cgit v1.2.3-70-g09d2