[user]
  name = Austen
  email = stonewareslord@gmail.com
[alias]
  pu = push --all
  co = checkout
  ci = commit -m
  a = add
  st = status
  br = branch
  hist = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
  type = cat-file -t
  dump = cat-file -p
	d = difftool
    lg = log --all --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ci) %C(bold blue)<%an>%Creset' --abbrev-commit
[push]
  default = simple
[core]
  excludesfile = /home/stonewareslord/.gitignore_global
[diff]
	tool = vimdiff
[difftool]
	prompt = false
[merge]
  tool = diffconflicts
[mergetool "diffconflicts"]
  cmd = diffconflicts vim $BASE $LOCAL $REMOTE $MERGED
  trustExitCode = true
  keepBackup = false
[http]
  sslVerify = false