X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=rc%2Fgitconfig;h=b77e7e2748fbe187e7c9b5712c0a55fcbdf60cd5;hb=7c5076668edce6b5650d075701b59ab710677e3d;hp=719fcefec83ca387838cf3c438c44033f9148446;hpb=0c802537ec02d6cfea4c41b3138535c09a319489;p=clearscm.git

diff --git a/rc/gitconfig b/rc/gitconfig
index 719fcef..b77e7e2 100644
--- a/rc/gitconfig
+++ b/rc/gitconfig
@@ -1,6 +1,6 @@
 [user]
   name = Andrew DeFaria
-  email = Andrew@DeFaria.com
+  email = A.DeFaria@cpanel.net
 
 [pack]
   windowMemory=128m
@@ -11,6 +11,7 @@
   pager = less -RX
   packedGitLimit=128m
   packedGitWindowSize=128m
+  excludesfile = ~/.gitignore
 
 [color]
   status=auto
@@ -54,4 +55,12 @@
 [push]
   default = simple
 [http]
-	sslVerify = false
+  sslVerify = false
+[credential]
+  helper = store --file ~/.git-credentials
+[pull]
+  rebase = false
+[merge]
+  tool = meld
+[mergetoo "meld"]
+  cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"