X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=rc%2Fgitconfig;h=f90378692102dff3584f2669d6dd0061774c0c65;hb=49444d483588fca89ea94c8754b8b71940b9711f;hp=6fdaf4b1023b32784e2e28d60c36c05116ba755e;hpb=559f9045ae05e457c7eb4b6c684aa9651b98971a;p=clearscm.git

diff --git a/rc/gitconfig b/rc/gitconfig
index 6fdaf4b..f903786 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
@@ -46,3 +56,7 @@
   default = simple
 [http]
 	sslVerify = false
+[credential]
+	helper = store
+[pull]
+	rebase = false