Added ulw

[clearscm.git] / rc / gitconfig

diff --git a/rc/gitconfig b/rc/gitconfig
index 550623e..13ba678 100644 (file)
--- 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"