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
6fdaf4b
..
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,12
+11,22
@@
pager = less -RX
packedGitLimit=128m
packedGitWindowSize=128m
pager = less -RX
packedGitLimit=128m
packedGitWindowSize=128m
+ excludesfile = ~/.gitignore
[color]
status=auto
diff=auto
branch=auto
[color]
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
# Currently these are restating the default
[color "branch"]
current=green
@@
-24,7
+34,7
@@
remote=red
[color "diff"]
remote=red
[color "diff"]
- external = /
usr/local/bin/git-
meld
+ external = /
bin/
meld
[color "status"]
added=yellow
[color "status"]
added=yellow
@@
-45,4
+55,12
@@
[push]
default = simple
[http]
[push]
default = simple
[http]
- sslVerify = false
+ sslVerify = false
+[credential]
+ helper = store --file ~/.git-credentials
+[pull]
+ rebase = false
+[merge]
+ tool = meld
+[mergetoo "meld"]
+ cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"