[user]
name = Andrew DeFaria
- email = Andrew@DeFaria.com
+ email = A.DeFaria@cpanel.net
[pack]
windowMemory=128m
pager = less -RX
packedGitLimit=128m
packedGitWindowSize=128m
- excludesfile = /home/andrew/.gitignore
+ excludesfile = ~/.gitignore
[color]
status=auto
[push]
default = simple
[http]
- sslVerify = false
+ sslVerify = false
[credential]
- helper = store
+ helper = store --file ~/.git-credentials
+[pull]
+ rebase = false
+[merge]
+ tool = meld
+[mergetoo "meld"]
+ cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"