X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=rc%2Fgitconfig;h=13ba678b9191ecc629b57c947dfc69908192f254;hb=74fc3dcf5806f0c3ecd1851fca1e7233d99d1d8e;hp=550623e342a3a480b101505db6f80673d098fe42;hpb=b4b5e8a7e6180ad1de85382f97e7496347057a51;p=clearscm.git

diff --git a/rc/gitconfig b/rc/gitconfig
index 550623e..13ba678 100644
--- a/rc/gitconfig
+++ b/rc/gitconfig
@@ -11,7 +11,7 @@
   pager = less -RX
   packedGitLimit=128m
   packedGitWindowSize=128m
-	excludesfile = /home/andrew/.gitignore
+  excludesfile = /home/andrew/.gitignore
 
 [color]
   status=auto
@@ -55,6 +55,12 @@
 [push]
   default = simple
 [http]
-	sslVerify = false
+  sslVerify = false
 [credential]
-	helper = store
+  helper = store --file ~/.git-credentials
+[pull]
+  rebase = false
+[merge]
+  tool = meld
+[mergetoo "meld"]
+  cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"