Added credential store to ~/.git-credentials

[clearscm.git] / rc / gitconfig

diff --git a/rc/gitconfig b/rc/gitconfig
index 63b5588..b2f74bd 100644 (file)
--- a/rc/gitconfig
+++ b/rc/gitconfig
@@ -1,39 +1,62 @@
 [user]
-       name = Andrew DeFaria
-       email = Andrew@DeFaria.com
+  name = Andrew DeFaria
+  email = Andrew@DeFaria.com
+
 [pack]
-       windowMemory=128m
-       threads=1
-       deltaCacheSize=128m
+  windowMemory=128m
+  threads=1
+  deltaCacheSize=128m
+
 [core]
-       pager = less -RX
-       packedGitLimit=128m
-       packedGitWindowSize=128m
+  pager = less -RX
+  packedGitLimit=128m
+  packedGitWindowSize=128m
+       excludesfile = /home/andrew/.gitignore
+
 [color]
-       status=auto
-       diff=auto
-       branch=auto
+  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
-       local=white
-       remote=red
+  current=green
+  local=white
+  remote=red
+
 [color "diff"]
-       external = /usr/local/bin/git-meld
+  external = /bin/meld
+
 [color "status"]
-       added=yellow
-       changed=green
-       untracked=cyan
+  added=yellow
+  changed=green
+  untracked=cyan
 
 [alias]
-       co=checkout
-       ci=commit
-       st=status
-       br=branch
-       hist=log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
-       type=cat-file -t
-       dump=cat-file -p
-       dlog=log --decorate
+  co=checkout
+  ci=commit
+  st=status
+  br=branch
+  hist=log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
+  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
+  default = simple
+[http]
+       sslVerify = false
+[credential]
+       helper = store --file ~/.git-credentials
+[pull]
+       rebase = false