.gitconfig

.gitconfig

[user]
  name = Matthew Callis
  email = 
  signingkey = XXXXXXXXXXXXXXXX
[github]
  user = MatthewCallis
[push]
  default = current
[pull]
  default = current
  rebase = true
[fetch]
  prune = true
[advice]
  statusHints = false
  pushNonFastForward = false
[core]
  excludesfile = /Users/matthew/.gitignore
  editor = atom --wait
  hideDotFiles = false
  quotepath = false
  precomposeunicode = true
[color]
  branch      = auto
  diff        = auto
  grep        = auto
  interactive = auto
  log         = auto
  status      = auto
  ui          = 1
  pager       = true
[color "branch"]
  current = yellow reverse
  local   = yellow
  remote  = green
[color "diff"]
  meta = yellow bold
  frag = magenta bold
  old  = red bold
  new  = green bold
[color "status"]
  added     = green
  changed   = cyan
  untracked = yellow
[alias]
  aliases            = config --global --get-regexp alias.*
  bs                 = bisect
  br                 = branch
  branches           = branch -a
  ci                 = commit -am
  msg                = commit --allow-empty -m
  co                 = checkout
  cp                 = cherry-pick
  df                 = diff
  diffindex          = diff-index -p -M -b -w --color HEAD
  dsf                = "!git diff --color $@ | diff-so-fancy"
  lg                 = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
  slog               = log --pretty=format:'%h - %an, %ar : %s'
  treezy             = log --graph --full-history --all --color --pretty=format:"%x1b[31m%h%x09%x1b[32m%d%x1b[0m%x20%s"
  gl                 = log --decorate --stat --graph --pretty=format:'%C(yellow)%h%Creset (%ar - %Cred%an%Creset), %s%n'
  who                = shortlog -nes
  ph                 = push origin master
  pl                 = pull origin master
  rb                 = rebase
  squash             = rebase -i HEAD~
  undo               = reset --hard
  unstage            = reset HEAD
  st                 = status
  publish            = !sh -c 'CUR=`git branch | grep \\*` && git checkout ${1:-"master"} && git merge ${CUR:2} && git push && git checkout ${CUR:2}' -
  sync               = !sh -c 'CUR=`git branch | grep \\*` && git checkout ${1:-"master"} && git cherry HEAD ${CUR:2} | cut -sd + -f 2 | xargs -L1 -r git cherry-pick && git push && git checkout ${CUR:2}' -
  update             = !sh -c 'git pull --rebase origin ${1:-"master"}' -
  whois              = "!sh -c 'git log -i -1 --pretty=\"format:%an <%ae>\n\" --author=\"$1\"' -"
  whats-in-the-stash = stash show -p
  fuck               = !sh -c 'git branch -D ${1}; git push origin --delete ${1}' -
  pr                 = "!f() { git fetch -fu origin refs/pull/$1/head:pr/$1; } ; f"
  prr                = "!f() { git fetch -fu $1 refs/pull/$2/head:pr/$2; } ; f"
  pru                = "!f() { git fetch -fu upstream refs/pull/$1/head:pr/$1; } ; f"
  pr-clean           = "!git for-each-ref refs/heads/pr/* --format='%(refname)' | while read ref ; do branch=${ref#refs/heads/} ; git branch -D $branch ; done"
[apply]
  whitespace = strip
[branch "master"]
  remote = origin
  merge = refs/heads/master
[difftool "Kaleidoscope"]
  cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[mergetool "Kaleidoscope"]
  cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
  trustExitCode = true
[diff]
  tool = Kaleidoscope
[difftool]
  prompt = false
[mergetool]
  prompt = false
[merge]
  tool = Kaleidoscope
[help]
  autocorrect = 1
[color "diff-highlight"]
  oldNormal = red bold
  oldHighlight = red bold 52
  newNormal = green bold
  newHighlight = green bold 22
[credential]
  helper = osxkeychain
[commit]
  gpgsign = true
[diff "sopsdiffer"]
	textconv = sops -d