X-Git-Url: http://git.madism.org/?p=~madcoder%2Fdotfiles.git;a=blobdiff_plain;f=gitconfig;fp=gitconfig;h=81fa0a76e02c007bb9c597881db89b916722cd55;hp=491456766ff8f33047b494b5f0fdb45d87bd86a0;hb=4e2ee5cc454ea39fcd93270a9d6dfcb9370f5406;hpb=b432593cd0e91f2b0eb9bba5d106b563cd98e916

diff --git a/gitconfig b/gitconfig
index 4914567..81fa0a7 100644
--- a/gitconfig
+++ b/gitconfig
@@ -27,7 +27,7 @@
 
 [user]
     name = Pierre Habouzit
-    email = madcoder@debian.org
+    email = phabouzit@apple.com
 
 [color]
     ui     = auto
@@ -52,6 +52,7 @@
 [merge]
     verbosity = 1
     conflictstyle = diff3
+    tool = opendiff
 [clean]
     requireForce = false
 [pack]
@@ -80,6 +81,7 @@
 [url "ssh://git.debian.org"]
     pushInsteadOf = git://git.debian.org
     pushInsteadOf = git.debian.org:
-
 [branch "*"]
     mergeoptions = -Xpatience
+[credential]
+	helper = osxkeychain