X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=rc%2Fgitconfig;h=719fcefec83ca387838cf3c438c44033f9148446;hb=20dba32a51b3f2d58623ae1151987aca7a9b5f16;hp=2d54e48adc9eedbd9c185fc7e77285b5dddb62bf;hpb=789e78564829765f3da4d9d6ff55b9394acdf4fc;p=clearscm.git

diff --git a/rc/gitconfig b/rc/gitconfig
index 2d54e48..719fcef 100644
--- a/rc/gitconfig
+++ b/rc/gitconfig
@@ -17,6 +17,15 @@
   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 +33,7 @@
   remote=red
 
 [color "diff"]
-  external = /usr/local/bin/git-meld
+  external = /bin/meld
 
 [color "status"]
   added=yellow
@@ -44,3 +53,5 @@
 
 [push]
   default = simple
+[http]
+	sslVerify = false