projects
/
clearscm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rsync Mikey & Kent
[clearscm.git]
/
rc
/
gitconfig
diff --git
a/rc/gitconfig
b/rc/gitconfig
index
b9815e6
..
b77e7e2
100644
(file)
--- a/
rc/gitconfig
+++ b/
rc/gitconfig
@@
-1,6
+1,6
@@
[user]
name = Andrew DeFaria
[user]
name = Andrew DeFaria
- email = A
ndrew@DeFaria.com
+ email = A
.DeFaria@cpanel.net
[pack]
windowMemory=128m
[pack]
windowMemory=128m
@@
-11,6
+11,7
@@
pager = less -RX
packedGitLimit=128m
packedGitWindowSize=128m
pager = less -RX
packedGitLimit=128m
packedGitWindowSize=128m
+ excludesfile = ~/.gitignore
[color]
status=auto
[color]
status=auto
@@
-54,6
+55,12
@@
[push]
default = simple
[http]
[push]
default = simple
[http]
-
sslVerify = false
+ sslVerify = false
[credential]
[credential]
- helper = store
+ helper = store --file ~/.git-credentials
+[pull]
+ rebase = false
+[merge]
+ tool = meld
+[mergetoo "meld"]
+ cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"