[user] name = Eryn Wells email = eryn@erynwells.me [core] editor = vim quotepath = false excludesfile = ~/.gitignore [color] ui = auto [alias] # Commits c = commit cm = commit -m ca = commit -a cam = commit -am # Amended commits cn = commit --amend cna = commit --amend -a cnam = commit --amend -am # Status, diffs s = status l = log lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative d = diff dc = diff --cached dt = difftool mine = log --author='Eryn Wells' # Branches, etc b = branch co = checkout cob = checkout -b # Merges and rebases m = merge ma = merge --abort mt = mergetool rb = rebase rbi = rebase --interactive rbc = rebase --continue rba = rebase --abort rbs = rebase --skip rbm = rebase origin/master master # Resets, moving HEAD r = reset r1 = reset HEAD^ r2 = reset HEAD^^ rh = reset --hard rh1 = reset --hard HEAD^ rh2 = reset --hard HEAD^^ # Remotes p = push -u pf = push -uf f = fetch sup = submodule update --recursive [ui] color = true [diff] tool = KS [difftool] prompt = false [difftool "KS"] cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\" [merge] tool = KS [mergetool] keepBackup = true prompt = false [mergetool "KS"] cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot trustExitCode = true [push] default = simple [rebase] autoStash = true