.gitconfig

[alias]
  amend       = commit --amend
  amend       = commit --amend
  ammend      = commit --amend
  br          = branch
  bra         = branch -a
  brc         = rev-parse --abbrev-ref HEAD
  brd         = branch -d
  brdf        = branch -D
  catchup     = log --patch --reverse --topo-order _ribbon..origin/master
  ch          = cherry
  ci          = commit -v
  cia         = commit -av
  co          = checkout
  cob         = checkout -b
  conflicts   = !vim $(git diff --name-only --diff-filter=U)
  cpk         = cherry-pick
  ctags       = !.git/hooks/ctags
  di          = diff
  diffc       = diff --cached --
  diffn       = diff --name-only
  diffnorigin = diff origin/master --name-only
  idff        = diff
  last        = log -1 HEAD
  logp        = log --oneline --abbrev-commit --graph --decorate
  ls          = ls-remote .
  mine        = !git log --author=`git config user.email`
  mr          = !lab mr new
  pgm         = push github master
  phm         = push heroku master
  pr          = pull-request
  pro         = pull-request -o
  prom        = pull-request -b main -o
  pu          = push -u
  pum         = push upstream master
  rba         = rebase --abort
  rbc         = rebase --continue
  rbm         = rebase master
  recent      = log --oneline -10
  ribbon      = tag --force _ribbon origin/master
  sha         = log -1 --oneline HEAD
  softrm      = rm --cached --
  softrmdir   = rm --cached -r --
  st          = status
  sta         = stash
  stl         = stash list
  stp         = stash pop
  sync       = !reposync
  undo        = reset --soft HEAD~1
  unstage     = reset HEAD --
  yoink       = cherry-pick

[branch]
  autosetuprebase = remote

[core]
  editor = nvim
  excludesfile = ~/.gitignore.global
  pager = delta

[color]
  status = auto
  interactive = auto
  grep = auto
  branch = auto
  diff = auto
  ui = true


[commit]
  gpgsign = true

# maybe: villsau zebra-dark
# meh?: collared-trogon  calochortus-lyallii
# almost, but no: chameleon mantis-shrimp matis-shrimp-lite woolly-mammoth
#

[delta]
  features = villsau
  navigate = true  # use n and N to move between diff sections
  light = false
  dark = true
  side-by-side = false


[delta "default"]
    line-numbers = true

[delta "magit"]
    line-numbers = false

[diff]
  colorMoved = default

[filesystem "AdoptOpenJDK|1.8.0_232|/dev/disk1s2"]
  timestampResolution = 1001 milliseconds
  minRacyThreshold = 0 nanoseconds

[filter "lfs"]
  process = git-lfs filter-process
  required = true
  clean = git-lfs clean -- %f
  smudge = git-lfs smudge -- %f

[filter "media"]
  clean = git-media-clean %f
  smudge = git-media-smudge %f

[github]
  user = localshred

[gpg]
  format = ssh

# See https://blog.1password.com/git-commit-signing/
# See https://calebhearth.com/sign-git-with-ssh
[gpg "ssh"]
  program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
  allowedSignersFile = /Users/bj/.ssh/allowed_signers

[include]
  path = ~/code/src/utilities/dotfiles/delta-themes.gitconfig

[init]
  defaultBranch = main

[interactive]
  diffFilter = delta --color-only --features=interactive

[merge]
  conflictstyle = diff3

[pager]

[push]
  default = current

; [url "git@github.com:"]
; 	insteadOf = https://github.com/
; [url "git@bitbucket.org:"]
;  	insteadOf = https://bitbucket.org/
; [url "git@gitlab.com:"]
; 	insteadOf = https://gitlab.com/

[user]
  name = BJ Neilsen
  email = bj.neilsen@gmail.com
  signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINiZrJmwtdHkKYQ+tnxXvuL+N9XPINq0lOL3ttTRz8aE
[pull]
	rebase = true