[user] name = Egor Tensin email = Egor.Tensin@gmail.com [core] editor = vim autocrlf = input [push] default = current [merge] tool = kdiff3 [mergetool "kdiff3"] trustExitCode = false [mergetool] keepBackup = false [diff] tool = kdiff3 [difftool] keepBackup = false [difftool "kdiff3"] trustExitCode = false [pull] ff = only [alias] clean-all = clean -fdx clean-ignored = clean -fdX clean-unknown = clean -fd l = log --oneline # This is awesome: http://stackoverflow.com/a/1838938/514684 ll = log --graph --full-history --all --pretty=format:"%h%x09%d%x20%s" lll = log --graph --full-history --all --color --pretty=tformat:"%x1b[31m%h%x09%x1b[32m%d%x1b[0m%x20%s%x20%x1b[33m(%an)%x1b[0m" wdiff = diff --word-diff xx = update-index --add --chmod=+x [fetch] prune = true