From 344f809ff1bdc8d8cc00de4e4651aff8722a147b Mon Sep 17 00:00:00 2001 From: Guangxiong Lin Date: Sun, 23 Jan 2022 10:29:01 +0800 Subject: Remove --tool vimdiff in .tigrc This is to make commands in .tigrc use default difftool in .gitconfig. So it will not influence when I change difftool in the future. --- .tigrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tigrc b/.tigrc index a5bed01..c443219 100644 --- a/.tigrc +++ b/.tigrc @@ -23,7 +23,7 @@ bind generic S view-grep bind generic D !git difftool --no-prompt --trust-exit-code %(commit)^! bind diff D !git difftool --no-prompt --trust-exit-code %(commit)^! -- %(file) bind stage D !git difftool --no-prompt --trust-exit-code HEAD -- %(file) -bind stage D !sh -c "git difftool --tool=vimdiff --trust-exit-code --no-prompt `expr '%(status)' : 'Staged changes' >/dev/null && echo --staged` -- '%(file)'" +bind stage D !sh -c "git difftool --no-prompt --trust-exit-code `expr '%(status)' : 'Staged changes' >/dev/null && echo --staged` -- '%(file)'" # Misc bind generic T !git notes edit %(commit) -- cgit v1.2.3