X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=rc%2Fgitconfig;h=13ba678b9191ecc629b57c947dfc69908192f254;hb=a9acda90df2ba4a4777fe263005a5d45ffd869e0;hp=719fcefec83ca387838cf3c438c44033f9148446;hpb=a70e80a6af6e31d56b120348bc8bc23cdd6543f5;p=clearscm.git

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