Last Updated: February 25, 2016
·
4.117K
· nathanlong

Use MacVim as your git diff tool (no external script)

Add this to your gitconfig file:

[diff]
    tool = mvimdiff
[difftool "mvimdiff"]
    cmd = mvim -f -d \"$LOCAL\" \"$REMOTE\"

You can now invoke it with git difftool $FILE to get local differences on a file in your gitrepo. Invoking it without any arguments runs through every modified file in your repo.

1 Response
Add your response

Works great, thanks! I did have to add the mvim script to my $PATH to get it working though (which was easy enough, I just downloaded the script separately from Github).

over 1 year ago ·