[user] name = Austen Adler email = stonewareslord@gmail.com signingkey = CCDFE3F1 [commit] gpgsign=true [alias] i = "!git br&&git st" # coa = "!for i in $(git branch -a|cut -b3-|grep remotes|sed -e 's/remotes\///'|cut -d/ -f1 --complement|cut -d\ -f1);do git checkout $i;done" pul = pull pus = push --all co = checkout ci = commit -m aci = "!git add --all;git commit -m" setup = "!git init;git commit --allow-empty -m 'Initial commit'" a = add aa = add --all 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 d = difftool cbranch = !sh -c 'git commit -m \"$2\"&&git branch $1&&git reset --hard HEAD~1&&git co \"$1\"' - nbranch = !sh -c 'git branch $1&&git reset --hard HEAD~1&&git co \"$1\"' - size = "!git diff --cached --binary | wc -c | numfmt --to=iec-i" x = "!exec " unstage = reset HEAD -- [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 [credential] helper = cache [color] ui = auto [gui] recentrepo = /home/stonewareslord/git/sync recentrepo = /home/stonewareslord/git/school/service-garage