summaryrefslogtreecommitdiff
path: root/bin/git_diff
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2021-01-13 11:28:57 +0100
committerJohannes Ranke <jranke@uni-bremen.de>2021-01-13 11:28:57 +0100
commitb7eafd6b952466fe19b198b461f3e98b543dcba9 (patch)
tree93a6990e523d096e6d488c47e3f8c830e481db9e /bin/git_diff
parentf700afd9bcacd4f91daa9ca28e8592bd8f5055db (diff)
Use kdiff3 for git, set default branch to main
Diffstat (limited to 'bin/git_diff')
-rwxr-xr-xbin/git_diff5
1 files changed, 2 insertions, 3 deletions
diff --git a/bin/git_diff b/bin/git_diff
index 6193650..8b6d242 100755
--- a/bin/git_diff
+++ b/bin/git_diff
@@ -4,7 +4,7 @@
# From https://stackoverflow.com/a/7669988/3805440, thanks
# side-by-side diff with custom options:
-# /usr/bin/sdiff -w200 -l "$2" "$5"
+#/usr/bin/sdiff -w200 -l "$2" "$5"
# using kdiff3 as the side-by-side diff:
/usr/bin/kdiff3 "$2" "$5"
@@ -13,5 +13,4 @@
#/usr/bin/meld "$2" "$5"
# using VIM
-#/usr/bin/vimdiff "$2" "$5"
-
+#/usr/bin/nvim -d "$2" "$5"

Contact - Imprint