gitconfig

[user]
	name = sanp
  email = sanpietro.steve@gmail.com
[core]
  editor = nvim
  excludesfile = ~/.gitignore_global
[credential]
	helper = osxkeychain
[push]
  default = simple
[pull]
	rebase = false
[pager]
  branch = false
[alias]
  last = log -1 HEAD
  logg = log --pretty=format:\"%h - %an, %ar : %s\"
  graph = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset%n' --abbrev-commit --date=relative --branches
  unstage = reset HEAD --
  st = status
  co = checkout
  ci = commit
  br = branch
  rb = rebase
  sm = submodule
  lf = ls-files
  lfo = ls-files -o --exclude-per-directory=.gitignore
  lola = log --graph --decorate --pretty=oneline --abbrev-commit --name-status
  bra = branch --sort=-committerdate
  brd = branch --sort=committerdate
  brdate = for-each-ref --sort=-committerdate refs/heads/ --format='%(committerdate:short)  -  %(refname:short)'
[color]
  ui = true
[color "diff"]
  meta = yellow
  frag = magenta # line info
  old = red # deletions
  new = green # additions
  whitespace = red reverse
[diff]
  tool = nvim
  guitool = diffmerge
  submodule = log
  algorithm = patience
  indentHeuristic = true
[difftool]
  prompt = false
[difftool "nvim"]
  cmd = nvim -d $LOCAL $REMOTE -c 'wincmd l'
[difftool "diffmerge"]
  cmd = "/Applications/DiffMerge.app/Contents/Resources/diffmerge.sh --nosplash \"$LOCAL\" \"$REMOTE\""
[merge]
  # tool = nvim
  ; tool = vim_mergetool
  ; guitool = diffmerge
  tool = diffmerge
  submodule = log
  algorithm = patience
  indentHeuristic = true
  conflictstyle = diff3
[mergetool]
  prompt = false
  keepBackup = false
  trustExitCode = true
[mergetool "vim_mergetool"]
  cmd = nvim -f -c "MergetoolStart" "$MERGED" "$BASE" "$LOCAL" "$REMOTE" -c ':1'
[mergetool "nvim"]
  # cmd = nvim -d $MERGED $LOCAL $BASE $REMOTE -c 'wincmd J'
  # cmd = nvim -d $MERGED $LOCAL $BASE $REMOTE -c 'wincmd J' -c 'wincmd k' -c 'wincmd l' -c 'resize 40'
  cmd = nvim -d $LOCAL $MERGED $REMOTE -c 'wincmd l'
[mergetool "diffmerge"]
  cmd = "/Applications/DiffMerge.app/Contents/Resources/diffmerge.sh --merge --result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\""

# In order to override username and email for work github accounts, store
# work info in separate .local-giconfig file. Should have a [name] block.
# Important that this include is at the bottom of this file in order to
# ensure that it overrides the above settings.
[include]
  path = ~/.local-gitconfig