diff --git a/bash_aliases b/bash_aliases
index 1481ead..7e6b271 100755
--- a/bash_aliases
+++ b/bash_aliases
@@ -90,6 +90,7 @@ function git-config-joshs()
     git config --global core.excludesfile ${HOME}/.gitignore
     git config --global core.pager 'less -FRXi'
     git config --global alias.dc 'diff --cached'
+    git config --global alias.gdiff '!f() { GIT_EXTERNAL_DIFF=git_gvimdiff git --no-pager diff $1; }; f'
 }
 alias git-find-lost-commit='git fsck --lost-found'
 if [[ "$(which jsvn 2>/dev/null)" != "" ]]; then
diff --git a/git_gvimdiff b/git_gvimdiff
new file mode 100755
index 0000000..0b59713
--- /dev/null
+++ b/git_gvimdiff
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+gvimdiff "$2" "$5"
+# give gvimdiff a chance to read the file before exiting
+sleep 1