# vim: ft=gitconfig [include] path = tools/kdiff3 path = config.os path = config.local [alias] co = checkout d = diff l = log --graph --pretty=graph --date=relative up = pull --prune --rebase=merges --autostash patch = !git --no-pager diff --no-color st = status --short shove = "!f() { git push ${1:-origin} :; }; f" [color "diff"] meta = yellow frag = magenta bold commit = yellow bold old = red bold new = green bold whitespace = red reverse [color "diff-highlight"] oldNormal = red bold oldHighlight = red bold 52 newNormal = green bold newHighlight = green bold 22 [column] ui = auto [core] pager = "diff-so-fancy | less --tabs=4 -RFX" [diff] colorMoved = true [dude] icon = ~/.config/git-dude/icon.png [filter "lfs"] clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f process = git-lfs filter-process required = true [gpg] program = gpg-for-git-signing [log] decorate = true [merge] conflictStyle = diff3 [pretty] graph = tformat:%C(auto)%h %G? %s% gD% D [pull] rebase = false [push] default = simple gpgSign = if-asked [rerere] enabled = true [status] branch = true [submodule] recurse = true [url "git@github.com:"] pushInsteadOf = https://github.com/ [user] name = Danielle McLean email = dani@00dani.me