_gitconfig

[include]
  # pull machine-specific info I want to use on the machine
  path = .gitconfig.d/user.txt
[color]
  interactive = auto
  ui = auto
  branch = auto
[color "diff"]
  added = green bold
  changed = yellow bold
  modified = yellow bold
  untracked = red bold
[color "status"]
  added = green bold
  changed = yellow bold
  modified = yellow bold
  untracked = red bold
[core]
  editor = vim
  excludesfile = ~/.gitignore
  autocrlf = input
  safecrlf = false
  fileMode = false
  pager = diff-so-fancy | less --tabs=4 -RFX
[alias]
  # general
  aa = add --all
  st = status
  ci = commit
  co = checkout
  cp = cherry-pick
  ls = ls-tree -r HEAD --name-only
  pushall = push --recurse-submodules=on-demand
  subup = submodule update

  # branching
  br = branch
  bnew = checkout -b

  # diff
  diffs = diff --staged
  diff-no-locks = diff -- ':!package-lock.json' ':!composer.lock' ':!Gemfile.lock' ':!pnpm-lock.yaml'
  show = icdiff
  today = diff --stat 'HEAD@{midnight}'

  # logging
  last = log -1
  lc = log -p -1
  logp = log --oneline -10
  logpp = log --oneline -25
  logppp = log --oneline -50
  tree = log --color --graph --abbrev-commit --oneline -n 15
[push]
  default = matching
[diff]
  tool = kdiff3
[filter "hawser"]
  clean = git hawser clean %f
  smudge = git hawser smudge %f
  required = true
[filter "lfs"]
  clean = git lfs clean %f
  smudge = git lfs smudge %f
  required = true
[status]
  submodulesummary = 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
[commit]
	template = /Users/mike/.stCommitMsg
[icdiff]
	options = --highlight --line-numbers
[user]
	name = Michael Chadwick
	email = michael.chadwick@gmail.com
[init]
	defaultBranch = main
[github]
	user = michaelchadwick