summaryrefslogtreecommitdiff
path: root/git
diff options
context:
space:
mode:
authorEkaitz Zárraga <ekaitz.zarraga@fon.com>2015-12-15 12:04:41 +0100
committerEkaitz Zárraga <ekaitz.zarraga@fon.com>2015-12-15 12:04:41 +0100
commitce9db5c85ca8456328dc669a6557c964a40afea0 (patch)
treea10f892598b661f34f416a09fc194506e01249fb /git
parentdeccc275df2fbc1ffe6601ab6f24a6fe3a360bfb (diff)
Vim and Git configs
Diffstat (limited to 'git')
-rw-r--r--git/.gitconfig11
1 files changed, 11 insertions, 0 deletions
diff --git a/git/.gitconfig b/git/.gitconfig
new file mode 100644
index 0000000..8868e0e
--- /dev/null
+++ b/git/.gitconfig
@@ -0,0 +1,11 @@
+[user]
+ email = ekaitz.zarraga@gmail.com
+ name = Ekaitz Zárraga
+[core]
+ editor = vim
+[color]
+ ui = auto
+[diff]
+ tool = vimdiff
+[merge]
+ tool = vimdiff