.gitconfig-managed

[user]
  email = garry@robustsoftware.co.uk
  name = Garry Shutler

[commit]
  gpgsign = true

[gpg]
  format = ssh

[color]
  ui = auto

[core]
  editor = nvim +startinsert
  excludesfile = /Users/gshutler/.gitignore_global

[diff]
  colorMoved = zebra
  indentHeuristic = true
  noPrefix = true

[fetch]
  prune = true

[init]
  defaultBranch = main

[log]
  follow = true

[merge]
  conflictstyle = diff3
  defaultToUpstream = true
  renamelimit = 9000
  tool = vimdiff

[mergetool]
  prompt = false

[push]
  default = upstream

[rebase]
  updateRefs = true

[rerere]
  enabled = true

[alias]
  a = add .
  ap = add -p
  amend = commit --amend
  cached = diff --cached
  c = commit --verbose
  clean-merged = "!(git checkout $(git main-branch)) && git fetch --prune && (git branch --merged | grep -v '*' | grep -v 'main|master' | xargs -n 1 git branch -d) && (git branch --remotes --merged | grep -v '*' | grep -v 'main|master' | sed 's/origin\\///' | xargs -n 1 git push --delete origin) && git checkout -"
  cm = commit --verbose
  co = checkout
  d = diff
  dm = "!(git diff $(git main-branch)...)"
  dms = "!(git diff --stat $(git main-branch)...)"
  du = diff @{upstream} @
  dw = diff -w
  f = fetch --all
  fall = fetch --all
  ff = merge --ff-only
  ffm = "!(git merge --ff-only $(git main-branch))"
  ffo = merge --ff-only
  l = log --graph --oneline --decorate
  ll = log --graph --all --oneline --decorate
  ma = "!(git checkout $(git main-branch))"
  main = checkout main
  master = checkout master
  mp = "!(git checkout $(git main-branch)) && git pull --ff-only"
  mt = mergetool
  n = checkout -b
  new = checkout -b
  noff = merge --no-ff
  nom = branch -vv --no-merged
  p = push
  pff-only = pull --ff-only --all
  po = "!git push --set-upstream origin $(git rev-parse --abbrev-ref HEAD)"
  pp = pull --ff-only --all
  rc = rebase --continue
  ri = rebase -i
  rim = "!(git rebase -i $(git main-branch))"
  rom = "!(git pull origin $(git main-branch) --rebase --interactive)"
  ru = rebase -i @{upstream}
  s = status --short
  wip = for-each-ref --sort='authordate:iso8601' --format='%(color:green)%(authordate:format:''%a %b %d %H:%M'')\t%(color:white)%(refname:short)' refs/heads

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

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

[includeIf "gitdir:~/Code/cronofy/"]
  path = .gitconfig-cronofy

[includeIf "gitdir:/Users/gshutler/Code/cronofy/"]
  path = .gitconfig-cronofy

[includeIf "gitdir:/System/Volumes/Data/code/cronofy/"]
  path = .gitconfig-cronofy