bpb-kit/home/.gitconfig

[alias]
  a = add
  amend = commit -a --amend
  br = branch
  c = commit
  changelog = log --date=short --pretty='format:%d %ad %s'
  ci = commit
  cm = commit -m
  co = checkout
  d = diff
  df = diff
  exec = "!exec "
  ec = !git edit-changed
  go = checkout
  l = log
  lg = log -p
  lol = log --graph --decorate --pretty=oneline --abbrev-commit
  lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
  log-notes = !git fetch origin refs/notes/review:refs/notes/review && git log --notes=review
  p = pull
  pul = pull
  root = rev-parse --show-toplevel
  s = status
  st = status
  stat = status
  sub = submodule
  push-gerrit = !git push origin HEAD:refs/for/${1:-`git rev-parse --abbrev-ref HEAD`}
  # TODO: add other team usernames:
  push-gerrit-tyler = !git push origin HEAD:refs/for/${1:-`git rev-parse --abbrev-ref HEAD`}%r=thcipriani
  push-gerrit-wip = !git push origin HEAD:refs/for/${1:-`git rev-parse --abbrev-ref HEAD`}%wip

  # Open changed files in tabs in vim (courtesy Dan Duvall):
  vim = "!vim -p $(git diff --name-only $@) #"

  # Handle accidentally typing git twice:
  git = !git

[user]
  name = Brennen Bearnes
  email = code@p1k3.com

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

[gui]
[push]
  default = simple
[credential]
  helper = gnome-keyring
[status]
  submoduleSummary = true
[gitreview]
  remote = origin
  username = brennen
[commit]
  template = ~/cheatsheets/git-commit.txt
[url "ssh://gerrit.wikimedia.org:29418"]
  pushInsteadOf = https://gerrit.wikimedia.org/r
[rebase]
  autoStash = true
[pull]
  rebase = true
[init]
  defaultBranch = main
[merge]
  # Via https://jvns.ca/blog/2024/02/16/popular-git-config-options/
  conflictstyle = zdiff3