X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=rc%2Fgitconfig;h=b2f74bdac1e4183171c12372ea7e814d7db603c8;hb=88c9cb9f6ed80dd31981b083593b1746695083b9;hp=6c59efff76904d4ffe2096a3ad4d00c2946a0de9;hpb=ea3919e139caf761ede00e6c00f6ca56a01e284f;p=clearscm.git

diff --git a/rc/gitconfig b/rc/gitconfig
index 6c59eff..b2f74bd 100644
--- a/rc/gitconfig
+++ b/rc/gitconfig
@@ -1,42 +1,62 @@
 [user]
-	name = Andrew DeFaria
-	email = adefaria@audience.local
+  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"]
-	meta=white bold
-	#frag=magenta bold
-	old=red
-	new=yellow
+  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 = matching
+  default = simple
+[http]
+	sslVerify = false
+[credential]
+	helper = store --file ~/.git-credentials
+[pull]
+	rebase = false