[user] email = stofflees@gmail.com name = Chris [pull] rebase = true [push] autoSetupRemote = true [init] defaultBranch = main [core] excludesfile = /home/chris/.config/git/ignore [filter "lfs"] clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f process = git-lfs filter-process required = true [alias] co = checkout br = branch ci = commit st = status [diff] algorithm = histogram # Clearer diffs on moved/edited lines colorMoved = plain # Highlight moved blocks in diffs mnemonicPrefix = true # More intuitive refs in diff output [commit] verbose = true # Include diff comment in commit message template [column] ui = auto # Output in columns when possible [branch] sort = -committerdate # Sort branches by most recent commit first [tag] sort = -version:refname # Sort version numbers as you would expect [rerere] enabled = true # Record and reuse conflict resolutions autoupdate = true # Apply stored conflict resolutions automatically