diff options
| author | Guangxiong Lin <[email protected]> | 2022-01-23 14:05:16 +0800 |
|---|---|---|
| committer | Guangxiong Lin <[email protected]> | 2022-01-23 14:05:16 +0800 |
| commit | bf123830ed9c0574b8cba35c0d6f18dd9b9e47a0 (patch) | |
| tree | 378516e47d0d844f545a56fa86b0266f5cc10d2f | |
| parent | cef30030bef011b506a568b5a1bd46b99ead72c0 (diff) | |
| download | dotfiles-bf123830ed9c0574b8cba35c0d6f18dd9b9e47a0.tar.gz dotfiles-bf123830ed9c0574b8cba35c0d6f18dd9b9e47a0.tar.bz2 dotfiles-bf123830ed9c0574b8cba35c0d6f18dd9b9e47a0.zip | |
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.
| -rw-r--r-- | .tigrc | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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)'" |