X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=rc%2Fgitconfig;h=63b55889c70f6058ce866ac24ade5bd655c9d396;hb=4bda7186bbd608c7e2a12bdbe09ba760f8f2d034;hp=6c59efff76904d4ffe2096a3ad4d00c2946a0de9;hpb=7c0b9dad6b576937844c9701bdf0f41a537fc670;p=clearscm.git

diff --git a/rc/gitconfig b/rc/gitconfig
index 6c59eff..63b5588 100644
--- a/rc/gitconfig
+++ b/rc/gitconfig
@@ -1,6 +1,6 @@
 [user]
 	name = Andrew DeFaria
-	email = adefaria@audience.local
+	email = Andrew@DeFaria.com
 [pack]
 	windowMemory=128m
 	threads=1
@@ -20,10 +20,7 @@
 	local=white
 	remote=red
 [color "diff"]
-	meta=white bold
-	#frag=magenta bold
-	old=red
-	new=yellow
+	external = /usr/local/bin/git-meld
 [color "status"]
 	added=yellow
 	changed=green
@@ -39,4 +36,4 @@
 	dump=cat-file -p
 	dlog=log --decorate
 [push]
-	default = matching
+	default = simple