settings/.gitconfig-mac
2018-12-04 14:01:13 -08:00

24 lines
1.2 KiB
Plaintext

[user]
name = tmont
email = tommy.mont@gmail.com
[color]
ui = true
[alias]
stat = status -sb
lg = log --graph --pretty=format:'%Cred%h%Creset %Cgreen%cr%Creset %Cblue%an%Creset%C(yellow)%d%Creset %s'
releases = !git log --date=local --decorate=full --all --pretty=format:'%Cgreen%ai%Creset\t%Cred%h%Creset\t%Cblue%cn%Creset\t%d\t%s' --abbrev-commit | grep -E 'release:? v?\\d+\\.\\d+\\.\\d+(:| -)' | perl -p -e 's%\\(.*?tag: .+?\\)\\s*release(:\\s*)?%%' | sort -i
release-count = !git releases | cut -f 3 | sort | uniq -c | sort -n -r
old-branches = for-each-ref refs/remotes/origin/ --sort=committerdate --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) %(color:blue)%(authorname)%(color:reset) (%(color:green)%(committerdate:relative)%(color:reset))'
hidiff = "!f() { [ \"$GIT_PREFIX\" != \"\" ] && cd "$GIT_PREFIX"; git diff --color $@ | diff-so-fancy | less --tabs=4 -RFX; }; f"
[push]
default = upstream
[core]
pager = less -x4
autocrlf = false
safecrlf = false
[merge]
tool = diffmerge
[mergetool "diffmerge"]
trustExitCode = true
cmd = /Applications/DiffMerge.app/Contents/Resources/diffmerge.sh --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"