gitconfig

[user]
        name = Chris AtLee
        email = chris.atlee@shopify.com
        signingKey = 84CD7E19

[color]
        diff = auto

[diff]
        renames = true

[alias]
        di = diff -U8 --patch-with-stat
        st = status -uno
        fpush = push --force-with-lease
        pullup = "!cd -- \"${GIT_PREFIX:-.}\" && git pull --rebase origin $(git symbolic-ref refs/remotes/origin/HEAD | xargs basename) && $SHELL -i -c 'dev up'"

[push]
        default = current

[include]
        path = ~/.gitsecrets
        path = /Users/catlee/.config/dev/gitconfig
        path = /Users/chrisatlee/.config/dev/gitconfig

[pull]
        ff = only
[rebase]
        autoStash = true

[merge]
        conflictstyle = zdiff3

[diff]
    colorMoved = default
[init]
        defaultBranch = main
[rerere]
        enabled = true
[submodule]
        recurse = true