Fixed bash_completion for Mac and updated system

[clearscm.git] / rc / gitconfig

diff --git a/rc/gitconfig b/rc/gitconfig
index 8c4dc6b..b2f74bd 100644 (file)
--- a/rc/gitconfig
+++ b/rc/gitconfig
@@ -11,12 +11,22 @@
   pager = less -RX
   packedGitLimit=128m
   packedGitWindowSize=128m
+       excludesfile = /home/andrew/.gitignore
 
 [color]
   status=auto
   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 +34,7 @@
   remote=red
 
 [color "diff"]
-  external = /usr/local/bin/git-meld
+  external = /bin/meld
 
 [color "status"]
   added=yellow
@@ -40,6 +50,13 @@
   type=cat-file -t
   dump=cat-file -p
   dlog=log --decorate
+  oldest-ancestor = !bash -c 'diff -u <(git rev-list --first-parent "${1:-master}") <(git rev-list --first-parent "${2:-HEAD}") | sed -ne \"s/^ //p\" | head -1' -
 
 [push]
   default = simple
+[http]
+       sslVerify = false
+[credential]
+       helper = store --file ~/.git-credentials
+[pull]
+       rebase = false