From bf123830ed9c0574b8cba35c0d6f18dd9b9e47a0 Mon Sep 17 00:00:00 2001 From: Guangxiong Lin Date: Sun, 23 Jan 2022 14:05:16 +0800 Subject: Update difftool rev in .tigrc The original commands in .tigrc use rev^! which will exclude all of its parents. It mades difftool not work. This commit changes it to rev^- which exclude 1th parent so the diff in difftool will march the diff showed in tig (--diff-merges=first-parent) now. --- .tigrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.tigrc') diff --git a/.tigrc b/.tigrc index 16d0709..814b797 100644 --- a/.tigrc +++ b/.tigrc @@ -22,8 +22,8 @@ bind refs M ?git merge %(branch) bind generic S view-grep # Use git difftool to view the diff -bind generic D !git difftool --no-prompt --trust-exit-code %(commit)^! -bind diff D !git difftool --no-prompt --trust-exit-code %(commit)^! -- %(file) +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 --no-prompt --trust-exit-code `expr '%(status)' : 'Staged changes' >/dev/null && echo --staged` -- '%(file)'" -- cgit v1.2.3