gitconfig

# This is Git's per-user configuration file.
[user]
# Please adapt and uncomment the following lines:
  name = Jeremy Hauschildt
  email = jeremy@jhauschildt.com
  signingkey = D1372D8D

[color]
  ui = auto
  diff = auto
  status = auto
  branch = auto
  showbranch = auto
  interactive = always

[color "branch"]
  current = green bold
  local = green
  remote = red bold

[color "diff"]
  meta = yellow bold
  frag = magenta bold
  old = red bold
  new = green bold

[color "status"]
  added = red
  changed = green
  untracked = cyan

[color "sh"]
  branch = yellow

[log]
  decorate = full

[merge]
  tool = vimdiff
  log  = true
  # conflictstyle = zdiff3  # TODO: change back to zdiff3 once all systems have newer version of git
  conflictstyle = diff3

[diff]
  tool = vimdiff
  renames = copies
  # Tell git diff to use mnemonic prefixes (index, work tree, commit, object) instead of the standard a and b notation
  mnemonicprefix = true
  algorithm = histogram

[difftool]
  tool = vimdiff
  prompt = false

[help]
  autocorrect = 1

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

[core]
  # Use user-global gitignore file
  excludesfile = ~/.gitignore_global
  # autocrlf = input
  editor = nvim

# Automatic `git config branch.BRANCHNAME.rebase true` on new branches/repos
# Changes default `git pull` to `git pull --rebase`
[branch]
  autosetuprebase = always
  sort = -committerdate

[mergetool "sourcetree"]
  cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
  trustExitCode = true

[rebase]
  autoStash = true

[commit]
  verbose = True
  gpgsign = false

[push]
  default = simple

[github]
  user = doot

[branch "master"]
  remote = origin
  merge = refs/heads/master

[alias]
  tree = log --oneline --graph --decorate --all
  lol = log --oneline --graph --decorate --all
  co = commit -m
  open = !vim `git-open.sh`

[pull]
  rebase = true