gitconfig

[user]
    email = esbensonne@gmail.com
    name = Esben Sonne

[includeIf "gitdir:~/oc/"]
    path = ~/.git_work_config

[core]
    editor = nvim
    whitespace = trailing-space,cr-at-eol
    excludesfile = ~/.gitignore

[init]
    defaultBranch = main

[column]
    ui = auto

[color]
    ui = auto
[color "branch"]
    current = yellow bold
    local = green
    remote = cyan
    upstream = blue
[color "diff"]
    context = white
    meta = yellow
    commit = green
    frag = magenta
    old = red
    new = green
    whitespace = red reverse
[color "status"]
    added = green
    changed = yellow
    untracked = red

[merge]
    # Include summaries of merged commits in newly created merge commit messages
    log = true
    tool = vimdiff
    defaultToUpstream = true

[mergetool "vimdiff"]
    conflictstyle = "diff3"
    trustExitCode = false

[commit]
    verbose = true

[push]
    autoSetupRemote = true
    default = tracking
    followTags = true

[fetch]
    recurseSubmodules = true
    prune = true
    # Prune local tags is probably a fine idea, but not for my workflow:
    # pruneTags = true
    all = true

[tag]
    sort = -version:refname

[log]
    decorate = short

[pretty]
    custom = %C(yellow)%h%Creset -%C(green)%d%Creset %s %Cgreen(%cr) %C(bold blue)%an%Creset

# Include ~/.git_aliases
[include]
    path = ~/.git_aliases

[diff]
    algorithm = histogram
    colorMoved = plain
    menmonicPrefix = true
    renames = true

[url "git@github.com:"]
    insteadOf = https://github.com/

[filter "lfs"]
    clean = git-lfs clean -- %f
    smudge = git-lfs smudge -- %f
    process = git-lfs filter-process
    required = true

[blame]
    ignoreRevsFile = .git-blame-ignore-revs

# Remember and reuse conflict resolutions:
[rerere]
    enabled = true
    autoupdate = true

[branch]
    sort = -committerdate