Skip to content

Instantly share code, notes, and snippets.

@danro
Created August 12, 2011 01:06
Show Gist options
  • Save danro/1141221 to your computer and use it in GitHub Desktop.
Save danro/1141221 to your computer and use it in GitHub Desktop.
Configure git diff to use pretty MacVim splits
[diff]
external = ~/scripts/git-diff-wrapper.sh
#!/bin/sh
# diff is called by git with 7 parameters:
# path old-file old-hex old-mode new-file new-hex new-mode
mvim -d "$2" "$5" | cat
@alesplin
Copy link

What version of git are you working on? For 1.8.1.2 (packaged with OS X) there's only 2 arguments passed, old-file and new-file.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment