gitconfig

[include]
    path = ~/.gitconfig.private
[user]
    name = Adam Kwiatek
[clean]
    requireForce = false
[merge]
    tool = nvimdiff
    ;conflictstyle = zdiff3
    log = 2
[color]
    ui = true
[gui]
    gcwarning = false
[push]
    autoSetupRemote = true
    default = simple
[core]
    excludesfile = ~/.gitignore_global
    whitespace = trailing-space,space-before-tab,tab-in-indent
    fileMode = true
    untrackedCache = true
    commitGraph = true
[delta]
    line-numbers = true
    relative-paths = true
    diff-so-fancy = true
[mergetool]
    writeToTemp = true
[rerere]
    enabled = true
[diff]
    tool = difftastic
    algorithm = histogram
    compactionHeuristic = true
    indentHeuristic = true
    renames = copy
[difftool]
    prompt = false
[pager]
    difftool = true
[difftool "difftastic"]
    # See `man git-difftool` for a description of MERGED, LOCAL and REMOTE.
    cmd = difft "$MERGED" "$LOCAL" "abcdef1" "100644" "$REMOTE" "abcdef2" "100644"
[alias]
    browser = "!tig"
    aliases = "!git config --list | sed --quiet '/^alias[.]/ { s/^alias[.]//; p }'"
    recent-branches = "!git for-each-ref --count=10 --sort=-committerdate refs/heads/ --format='%(refname:short)'"
    remove-old-branches = "!git branch | grep --invert-match '^[*]' | xargs --no-run-if-empty git branch --delete --force"
    backup-wip = "!git add :/ && git commit --message='$(date)' --no-edit && git fetch && git merge --no-edit @{u} origin/trunk && git push"
    test-merge = merge --no-commit --no-ff
    #squash = "!git merge --no-edit origin/trunk && git reset --soft origin/trunk && git commit --reuse-message='HEAD@{1}'"
    squash = "!git merge --no-edit origin/trunk && git log 'origin/trunk...HEAD@{1}' --format=format:%B --no-merges > /tmp/1.template && git reset --soft origin/trunk && git commit --template=/tmp/1.template --no-edit"
    praise = blame
[color "diff"]
    meta = yellow bold
    frag = magenta bold
    old = red bold
    new = green bold
[gerrit]
    createChangeId = true
[color "grep"]
    linenumber = yellow bold
    filename = green bold
[credential]
    helper = store
[fetch]
    writeCommitGraph = true
    prune = true
    output = compact
    pruneTags = false
[rebase]
    stat = true
    updateRefs = true
[status]
    showStash = true
[pull]
    rebase = true
[help]
    autocorrect = 30
[gc]
    writeCommitGraph = true
[advice]
    addEmptyPathspec = false
    skippedCherryPicks = false
[init]
    defaultBranch = main