aboutsummaryrefslogtreecommitdiff
path: root/git
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2012-01-12 16:51:06 +1300
committerTom Ryder <tom@sanctum.geek.nz>2012-01-12 16:51:06 +1300
commit806968df35bfffaa15e5579da381ce11d1e4080a (patch)
treeada7d4e85bca77299d12ae178f372b9916dac162 /git
parente551745c1251879d39e90c829c6c7ffb0206d405 (diff)
downloaddotfiles-806968df35bfffaa15e5579da381ce11d1e4080a.tar.gz
dotfiles-806968df35bfffaa15e5579da381ce11d1e4080a.zip
Added some stuff to my git configuration.
Diffstat (limited to 'git')
-rw-r--r--git/gitconfig9
1 files changed, 9 insertions, 0 deletions
diff --git a/git/gitconfig b/git/gitconfig
index df45808f..bc9e6fe7 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -5,3 +5,12 @@
[color]
ui = true
+[diff]
+ tool = vimdiff
+
+[difftool]
+ prompt = false
+
+[log]
+ date = local
+