[user] name = Luke Shumaker email = lukeshu@datawire.io [sendemail] # user.email is set to lukeshu@parabola.nu for some projects from = Luke Shumaker [color] ui = auto [push] default = nothing [merge "merge-changelog"] name = GNU-style ChangeLog merge driver driver = git-merge-changelog %O %A %B [alias] # Things I use all the time mergek = !gitk HEAD MERGE_HEAD ^$(git merge-base HEAD MERGE_HEAD) k = !gitk ref = show --format=reference --no-patch git = !git # Things I don't use because I forgot I have them lg = log --graph --format='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative hist = log --format='%h %ci -%C(yellow)%d%Creset %s %C(bold blue)<%an>%Creset' --abbrev-commit graphviz = "!f() { echo 'digraph git {' ; git log --pretty='format: %h -> { %p }' \"$@\" | sed 's/[0-9a-f][0-9a-f]*/\"&\"/g' ; echo '}'; }; f" apply-gitignore = "!git ls-files --cached --ignored --exclude-standard -z | xargs -r -0 git rm --cached" [filter "lfs"] clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f process = git-lfs filter-process required = true [gui] fontui = -family monospace -size 9 -weight normal -slant roman -underline 0 -overstrike 0 fontdiff = -family monospace -size 9 -weight normal -slant roman -underline 0 -overstrike 0 [versionsort] suffix = - [tag] sort = version:refname [rerere] enabled = false [url "git+ssh://lukeshu@git.launchpad.net/"] insteadof = lp: [url "git@github.com:datawire/aes-ratelimit"] insteadOf = https://github.com/datawire/aes-ratelimit [url "git@github.com:datawire/apro"] insteadOf = https://github.com/datawire/apro [url "git@github.com:datawire/telepresence2-proprietary"] insteadOf = https://github.com/datawire/telepresence2-proprietary [url "git@github.com:datawire/telepresence-pro"] insteadOf = https://github.com/datawire/telepresence-pro