Created
March 1, 2010 16:23
-
-
Save samuelspiza/318504 to your computer and use it in GitHub Desktop.
External visual diff for git.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/sh | |
# http://stackoverflow.com/questions/255202/ | |
# > how-do-i-view-git-diff-output-with-visual-diff-program | |
# by VonC - http://stackoverflow.com/users/6309/vonc | |
# diff is called by git with 7 parameters: | |
# path old-file old-hex old-mode new-file new-hex new-mode | |
# Specify this script globaly as diff.external: | |
# git config --global diff.external <path_to_wrapper_script> | |
"kdiff3" "$2" "$5" | |
exit 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
"meld" "$2" "$5" | |
exit 0 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment