diff options
Diffstat (limited to 'bin/git_diff')
-rwxr-xr-x | bin/git_diff | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/bin/git_diff b/bin/git_diff new file mode 100755 index 0000000..6193650 --- /dev/null +++ b/bin/git_diff @@ -0,0 +1,17 @@ +#!/bin/bash +# un-comment one diff tool you'd like to use +# +# From https://stackoverflow.com/a/7669988/3805440, thanks + +# side-by-side diff with custom options: +# /usr/bin/sdiff -w200 -l "$2" "$5" + +# using kdiff3 as the side-by-side diff: +/usr/bin/kdiff3 "$2" "$5" + +# using Meld +#/usr/bin/meld "$2" "$5" + +# using VIM +#/usr/bin/vimdiff "$2" "$5" + |