helm/gitconfig

45 lines
1.3 KiB
Plaintext
Raw Normal View History

2013-03-03 05:48:43 -08:00
[user]
2015-04-22 20:53:23 -07:00
name = Henrik Lissner
email = henrik@lissner.net
2013-11-22 20:24:27 -08:00
[github]
2015-04-22 20:53:23 -07:00
user = hlissner
2013-03-03 05:48:43 -08:00
[core]
2015-04-22 20:53:23 -07:00
excludesfile = ~/.gitignore
whitespace = trailing-space
pager = less -r
2013-03-03 05:48:43 -08:00
[color]
2015-04-22 20:53:23 -07:00
ui = true
2013-03-03 05:48:43 -08:00
[diff]
2015-04-22 20:53:23 -07:00
tool = vimdiff
2013-03-03 05:48:43 -08:00
[difftool]
2015-04-22 20:53:23 -07:00
prompt = false
2014-12-05 14:38:08 -08:00
cmd = vimdiff \"$LOCAL\" \"$REMOTE\"
[difftool "ediff"]
cmd = emacsclient -n --eval \"(ediff-files \\\"$LOCAL\\\" \\\"$REMOTE\\\")\"
2013-03-03 05:48:43 -08:00
[merge]
2015-04-22 20:53:23 -07:00
# Include summaries of merged commits in newly created merge commit messages
log = true
2015-06-20 01:24:30 -07:00
tool = ediff
[mergetool "ediff"]
2015-09-06 16:56:14 -07:00
cmd = emacsclient -c -a \"\" --eval \"(ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\")\"
[push]
2015-04-22 20:53:23 -07:00
default = simple
[credential]
2015-04-22 20:53:23 -07:00
helper = osxkeychain
2014-09-20 13:40:27 -07:00
[alias]
2015-04-22 17:45:30 -07:00
root = rev-parse --show-toplevel
2015-04-22 20:53:23 -07:00
undo-commit = reset --soft "HEAD^"
amend = commit --amend
ls = ls-files
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
unadd = reset HEAD
ammend = commit --amend
exec = "!exec "
2015-12-11 19:48:10 -08:00
squash = rebase -i origin/master
2014-12-05 14:38:08 -08:00
2015-04-22 20:53:23 -07:00
# data analysis
authors = !git log --format="%aN" | sort -u
ranked-authors = !git authors | sort | uniq -c | sort -n
emails = !git log --format="%aE" | sort -u
email-domains = !git log --format="%aE" | awk -F'@' '{print $2}' | sort -u