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

diff --git a/rc/gitconfig b/rc/gitconfig
index 6fdaf4b..13ba678 100644
--- a/rc/gitconfig
+++ b/rc/gitconfig
@@ -11,12 +11,22 @@
   pager = less -RX
   packedGitLimit=128m
   packedGitWindowSize=128m
+  excludesfile = /home/andrew/.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"