[alias] aa = add -A . br = branch ca = commit -S --amend cb = checkout -b ci = commit cm = commit -m co = checkout cs = commit -S csm = commit -S -m csa = commit -S --amend deleted = log --diff-filter=D --summary di = diff dic = diff --cached dicn = diff --cached --name-only din = diff --name-only dump = cat-file -p hist = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit ms = merge --squash pb = pull --rebase po = push origin por = push origin HEAD:refs/for/$1 pu = !"git fetch origin -v; git fetch upstream -v; git merge upstream/master" st = status type = cat-file -t [color] diff = auto status = auto branch = auto [core] editor = vim [user] name = Dave Gallant [push] default = current [pull] rebase = true [filter "lfs"] clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f required = true process = git-lfs filter-process [commit] gpgsign = true [gpg] program = gpg