From 18ba127ec3ab476d4cfca56479c8a1ce372bb577 Mon Sep 17 00:00:00 2001 From: typebrook Date: Tue, 26 Mar 2019 11:42:14 +0800 Subject: update --- tigrc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tigrc') diff --git a/tigrc b/tigrc index 0ffee14..d626a7b 100644 --- a/tigrc +++ b/tigrc @@ -66,7 +66,6 @@ bind status s ?git stash bind status S @git stash push -m "%(prompt Enter stash name: )" bind status gs !git stashstaged bind status p !git checkout --patch -- %(file) -bind status Tu @git update-index --assume-unchanged %(file) bind status c @git commit -m "%(prompt Enter commit message: )" bind status C !git commit @@ -74,6 +73,9 @@ bind status a ?git commit --amend bind status D ?rm %(file) +bind status !sh -c "git difftool -y \"$(git rev-parse --show-toplevel)/%(file)\"" +bind status Tu @git update-index --assume-unchanged %(file) + # stash view bind stash a ?git stash apply %(stash) bind stash n @sh -c "git stash drop %(stash) | \ @@ -95,4 +97,3 @@ bind refs bD ?git branch -D %(branch) # color color diff-header black yellow color diff-chunk white magenta -bind status !sh -c "git difftool -y \"$(git rev-parse --show-toplevel)/%(file)\"" -- cgit v1.2.3-70-g09d2