X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=rc%2Fgitconfig;h=b77e7e2748fbe187e7c9b5712c0a55fcbdf60cd5;hb=7ddf095f187ca60d9a70fb83b2bc3c2b6d91f088;hp=6fdaf4b1023b32784e2e28d60c36c05116ba755e;hpb=ed7943b5913aae90452e00009a19aaa86605b820;p=clearscm.git

diff --git a/rc/gitconfig b/rc/gitconfig
index 6fdaf4b..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,12 +11,22 @@
   pager = less -RX
   packedGitLimit=128m
   packedGitWindowSize=128m
+  excludesfile = ~/.gitignore
 
 [color]
   status=auto
   diff=auto
   branch=auto
 
+[diff]
+  tool = meld
+
+[difftool]
+  prompt = false
+
+[difftool "meld"]
+  cmd = meld "$LOCAL" "$REMOTE"
+
 # Currently these are restating the default
 [color "branch"]
   current=green
@@ -24,7 +34,7 @@
   remote=red
 
 [color "diff"]
-  external = /usr/local/bin/git-meld
+  external = /bin/meld
 
 [color "status"]
   added=yellow
@@ -45,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"