[init] defaultBranch = main [user] name = Tony Tang signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF23DQtdH5PODF9fYUHr49I1J3lfKLAPk4LG54MVUTcg email = tonytang@lilith.com [commit] gpgsign = true [gpg] format = ssh [gpg "ssh"] program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign" [url "https://"] insteadOf = git:// [core] editor = nvim excludesfile = /Users/lilithgames/.gitignore_global [pager] difftool = true #[diff] # external = difft # tool = difftastic # #[difftool] # prompt = false # #[difftool "difftastic"] # prompt = false # cmd = difft "$LOCAL" "$REMOTE" [alias] lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit pr = pull --rebase origin unstage = reset HEAD -- p = push st = status co = checkout cb = checkout -b br = branch cm = commit -s -m ca = commit --amend -s --no-edit d = diff ds = diff --staged dc = diff --cached #[difftool "sourcetree"] # cmd = opendiff \"$LOCAL\" \"$REMOTE\" # path = # #[mergetool "sourcetree"] # cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\" # trustExitCode = true [difftool "sourcetree"] cmd = opendiff \"$LOCAL\" \"$REMOTE\" path = [mergetool "sourcetree"] cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\" trustExitCode = true [filter "lfs"] process = git-lfs filter-process required = true clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f