projects
/
clearscm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes to support Macs
[clearscm.git]
/
rc
/
gitconfig
diff --git
a/rc/gitconfig
b/rc/gitconfig
index
6c59eff
..
63b5588
100644
(file)
--- a/
rc/gitconfig
+++ b/
rc/gitconfig
@@
-1,6
+1,6
@@
[user]
name = Andrew DeFaria
[user]
name = Andrew DeFaria
- email =
adefaria@audience.local
+ email =
Andrew@DeFaria.com
[pack]
windowMemory=128m
threads=1
[pack]
windowMemory=128m
threads=1
@@
-20,10
+20,7
@@
local=white
remote=red
[color "diff"]
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
[color "status"]
added=yellow
changed=green
@@
-39,4
+36,4
@@
dump=cat-file -p
dlog=log --decorate
[push]
dump=cat-file -p
dlog=log --decorate
[push]
- default =
matching
+ default =
simple