gitconfig

[user]
  name = Tristan (t4t5)
  email = t4t5@hey.com
  signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwkFgfUezTmYmKLgdR9F2x/oN7CtGCVKWN7R7h7bj7DFSxCTWn/TG9QniE0fmIHXU3Bh7ZJOuWGDx98f+cQDjZ79P2qEeI/7fqFCNObXlGqNmFr30L6+uYQWKp/ZFCb/OTHdKBRkwMaYHnoESOZRCB3U9w4A0acqUFlzYXMU+Qd+fmfAPGUa732v/PYKOXgovYLl/wA3WB9MXWK48dxsF7zTTqlstPcYVONeKM8Oojae6YOg/e9QYy0PYmSnFeYG+37xJ9psqLjAVEfM9Mt9KKuXoz9NpFNm7aEmrD5WUKJefYvJvw2s2JIM4GDS44JqCpumYwweFg9Xh9Gh81rmRt

[core]
  editor = nvim
	attributesfile = ~/.gitattributes
  pager = delta

[interactive]
  diffFilter = delta --color-only

[delta]
  navigate = true    # use n and N to move between diff sections
  syntax-theme = OneHalfDark

[init]
  defaultBranch = main

[alias]
  ac = !git add . && git commit
  pf = push --force-with-lease
  pl = pull
  cp = cherry-pick
  ca = commit --amend
  uncommit = reset --soft HEAD^
  unstage = reset
  lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
  lo = log --oneline
  browse = !hub browse
  issues = !hub browse -- issues
  pr = !git push && hub compare
  ds = !git diff --staged
  ref = reflog --format='%C(auto)%h %<|(5)%gd %C(blue)%cr%C(reset) %C(red)%gs%C(reset) (%s)'
  mup = !git checkout master && git fetch origin && echo && git lg master..origin/master && echo && git pull --quiet && git checkout -
	conflicted = !nvim +Conflicted
  fix = "!git commit --fixup \"$1\" && git rebase -i --autosquash \"$1\"~1 #"
  new = !open https://github.com/new

[status]
  showUntrackedFiles = all

[merge]
  ff = only
  conflictstyle = diff3

[diff]
  colorMoved = default

[pull]
  rebase = true

[push]
  default = current

[commit]
  template = ~/.gitmessage
	verbose = true
	gpgsign = true

[merge "merge-structure-sql"]
	name = Rails structure.sql merge driver
	driver = git-merge-structure-sql %A %O %B

[gpg]
  format = ssh

[gpg "ssh"]
  program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"