Merged MAPS2.0

[clearscm.git] / rc / gitconfig

diff --git a/rc/gitconfig b/rc/gitconfig
index b9815e6..b2f74bd 100644 (file)
--- a/rc/gitconfig
+++ b/rc/gitconfig
@@ -11,6 +11,7 @@
   pager = less -RX
   packedGitLimit=128m
   packedGitWindowSize=128m
+       excludesfile = /home/andrew/.gitignore
 
 [color]
   status=auto
@@ -56,4 +57,6 @@
 [http]
        sslVerify = false
 [credential]
-       helper = store
+       helper = store --file ~/.git-credentials
+[pull]
+       rebase = false