[user]
name = Andrew DeFaria
- email = Andrew@DeFaria.com
+ email = A.DeFaria@cpanel.net
[pack]
windowMemory=128m
pager = less -RX
packedGitLimit=128m
packedGitWindowSize=128m
+ excludesfile = ~/.gitignore
[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
remote=red
[color "diff"]
- external = /usr/local/bin/git-meld
+ external = /bin/meld
[color "status"]
added=yellow
type=cat-file -t
dump=cat-file -p
dlog=log --decorate
+ oldest-ancestor = !bash -c 'diff -u <(git rev-list --first-parent "${1:-master}") <(git rev-list --first-parent "${2:-HEAD}") | sed -ne \"s/^ //p\" | head -1' -
[push]
default = simple
+[http]
+ sslVerify = false
+[credential]
+ helper = store --file ~/.git-credentials
+[pull]
+ rebase = false
+[merge]
+ tool = meld
+[mergetoo "meld"]
+ cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"