[user] name = Egor Tensin email = Egor.Tensin@gmail.com [core] editor = vim autocrlf = false [diff] # Include submodule changes into git-diff's output. submodule = log [fetch] # Prune old branches: prune = true # Prune old tags (since Git 2.17.0): pruneTags = true [include] # Include a file with work-specific settings (like a different [user] # section under a specific directory). path = ~/.gitconfig_work [log] follow = true [mergetool] keepBackup = false [pull] # Don't create a merge commit, fast-forward only. ff = only [push] # If no refspec is given, push to the branch with the same name. default = current [status] submoduleSummary = true [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" # I think this is only usable on Cygwin, given all the file permission # madness there: xx = update-index --add --chmod=+x hide = update-index --skip-worktree unhide = update-index --no-skip-worktree hidden = !git ls-files -v | grep --basic-regexp \"^\\([[:lower:]]\\|S\\)\" [filter "lfs"] smudge = git-lfs smudge -- %f process = git-lfs filter-process required = true clean = git-lfs clean -- %f