aboutsummaryrefslogtreecommitdiff
path: root/gitconfig
diff options
context:
space:
mode:
Diffstat (limited to 'gitconfig')
-rw-r--r--gitconfig/mitch11
1 files changed, 11 insertions, 0 deletions
diff --git a/gitconfig/mitch b/gitconfig/mitch
index 14ad151..8c525cf 100644
--- a/gitconfig/mitch
+++ b/gitconfig/mitch
@@ -7,5 +7,16 @@
[alias]
hist = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
histv = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short --stat
+ dt = difftool
+ mt = mergetool
[pull]
ff = only
+[diff]
+ tool = vimdiff
+[difftool]
+ prompt = false
+[mergetool]
+ prompt = false
+[merge]
+ tool = vimdiff
+