gitconfig

[user]
  email = bolpin@gmail.com
  name = Brian Olpin

[http]
  sslVerify = false

[core]
  editor = vim --noplugin
  autocrlf = false
  excludesfile = /Users/bolpin/.gitignore

[push]
  # Only push branches that have been set up to track a remote branch(?)
	default = current

[branch]
  autosetuprebase = always

[alias]
  gl-fix = !sh -c 'git update-index --no-skip-worktree Gemfile.lock && git checkout -- Gemfile.lock && git update-index --skip-worktree Gemfile.lock'

  co = checkout
  cleanup = !git remote prune origin && git gc && git clean -df && git stash clear
  l = log --graph --pretty=format':%C(yellow)%h%Cblue%d%Creset %s %C(white) %an, %ar%Creset'
  lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
  ; loc = config --local
  ; glo = config --global
  ; peek = fetch -v --dry-run
  hist = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
  type = cat-file -t
  dump = cat-file -p
  whitespace = nowarn
  ci = commit
  st = status
  br = branch
  ; git ls-files -v| grep '^S'      # to list all marked files using git-update-index --skip-worktree
  gemfile-lock-fix = !sh -c 'git update-index --no-skip-worktree Gemfile.lock && git checkout -- Gemfile.lock && git update-index --skip-worktree Gemfile.lock'
  gemfile-lock-alt-fix = !sh -c 'git fetch --all && git checkout origin/master -- Gemfile.lock && git commit -m "tmp" --no-verify && git pull rebase'
  yl-fix = !sh -c 'git update-index --no-skip-worktree yarn.lock && git checkout -- yarn.lock && git update-index --skip-worktree yarn.lock'
  really-refresh = !sh -c 'git update-index --really-refresh && git reset --hard'
  praise = blame
  recent = shortlog -sn --since='7 days'

[help]
  autocorrect = 1

[github]
  user = bolpin

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

[merge]
  ; tool = vimdiff
  conflictstyle = diff3
  tool = p4merge

[mergetool]
    prompt = false
    keepBackup = false

[diff]
  tool = vimdiff

[difftool]
  prompt = false


[pull]
  rebase = true

[init]
  templatedir = ~/.git-templates

[credential]
  helper = manager-core