From ad72a83486b4e2c000c788e0494dc52237fcdcdb Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Tue, 4 Jun 2019 19:52:52 +0200 Subject: code-review-difftool: Use 'vim-fugitive' instead of 'vdwrap' Fugitive seems to have fewer surprises and basically just work in Vim. --- code-review-difftool | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/code-review-difftool b/code-review-difftool index 67cf21c..1451fa0 100755 --- a/code-review-difftool +++ b/code-review-difftool @@ -6,10 +6,7 @@ if [ $# -gt 1 ]; then REVIEW_BASE="$1" fi -git -c difftool.vdwrap.cmd='vdwrap $LOCAL $REMOTE' \ - -c diff.tool=vdwrap \ - difftool -t vdwrap --dir-diff "$REVIEW_BASE" - -# tabdo :wincmd b - -# git diff --stat "$REVIEW_BASE" +# TODO: Use `code-review-changed-files` instead of `git diff --name-only` +# TODO: Can't replace single dots as those could be part of a branch name +# vim -c 'tabdo Gdiff ${REVIEW_BASE/./}' -p $(git diff --name-only "$REVIEW_BASE") +vim -c 'tabdo Gdiff origin/master' -p $(git diff --name-only origin/master..) -- cgit v1.2.3