[user] email = vbrandl@riseup.net name = Valentin Brandl ; signingkey = 0x7FB009175885FC76 signingkey = 0x30D341DD34118D7D [commit] gpgsign = true [color] branch = true diff = true grep = true pager = true status = true ui = always [core] autocrlf = input editor = vim [push] default = simple followTags = true [url "git@github.com:"] insteadOf = gh: insteadOf = github: [github] user = vbrandl [alias] glog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' [format] pretty = format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' # A nice little github-like colorful, split diff right in the console. # via http://owen.cymru/github-style-diff-in-terminal-with-icdiff/ [diff] tool = icdiff [difftool] prompt = false [difftool "icdiff"] cmd = /usr/local/bin/icdiff --line-numbers $LOCAL $REMOTE