Install pathogen, minor tweaks

[~madcoder/dotfiles.git] / gitconfig

diff --git a/gitconfig b/gitconfig
index 4914567..81fa0a7 100644 (file)
--- 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