[user] name = daniel daum email = daniel@danieldaum.net signingkey = /Users/daniel/Library/Containers/com.maxgoedjen.Secretive.SecretAgent/Data/PublicKeys/de7dcf62affac3514c9b45b3da139182.pub [push] autoSetupRemote = true [commit] gpgsign = true [gpg] format = ssh [gpg "ssh"] allowedSignersFile = ~/.gitallowedsigners [tag] gpgSign = true [alias] # status st = status --short --branch # add a = add ap = add --patch # commit c = commit cm = commit --message # sync pl = pull --rebase ps = push fp = fetch --prune # cleanup sweep = "!git branch --merged | grep -v '\\*\\|main\\|master' | xargs -n 1 git branch -d" [core] pager = delta [interactive] diffFilter = delta --color-only [delta] navigate = true # use n and N to move between diff sections dark = true # or light = true, or omit for auto-detection [merge] conflictStyle = zdiff3 [diff] tool = difftastic [difftool "difftastic"] cmd = difft "$LOCAL" "$REMOTE" [difftool] prompt = false [pager] difftool = less -R [filter "lfs"] clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f process = git-lfs filter-process required = true