[user] name = Austen email = stonewareslord@gmail.com [alias] i = "!git br&&git st" pul = pull pus = push --all co = checkout ci = commit -m a = add st = status br = branch -av hist = log --all --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ci) %C(bold blue)<%an>%Creset' --abbrev-commit type = cat-file -t dump = cat-file -p d = difftool cbranch = !sh -c 'git commit -m \"$2\"&&git branch $1&&git reset --hard HEAD~1&&git co \"$1\"' - [push] default = matching [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