[alias] amend = commit --amend ap = add -p bd = branch -d bh = rev-parse --abbrev-ref HEAD ci = commit co = checkout d = diff dc = diff --cached dt = difftool emend = commit --amend --no-edit f = fetch gl = log -12 --color=always --all --graph --topo-order --pretty='format:%Cgreen%h%Creset %s %C(blue bold)(by %an)%Creset%C(yellow bold)%d%Creset%n' gll = log --color=always --all --graph --topo-order --pretty='format:%Cgreen%h%Creset %s %C(blue bold)(by %an)%Creset%C(yellow bold)%d%Creset%n' head = rev-parse HEAD hist = log --oneline --decorate --graph l = log -18 --color=always --all --topo-order --pretty='format:%Cgreen%h%Creset %s%Cred%d%Creset %C(blue bold)(by %an)%Creset' ll = log --color=always --all --topo-order --pretty='format:%Cgreen%h%Creset %s%Cred%d%Creset %C(blue bold)(by %an)%Creset' mf = merge --ff-only ob = clean -fdx p = push pfu = push --force-with-lease pu = push -u rbi = rebase -i origin/main rbis = rebase -i origin/master rbo = rebase origin/main rbos = rebase origin/master rom = reset --hard origin/main rs = reset --hard sa = stash --include-untracked sf = switch -f si = switch sic = switch -c st = status wn = log ..origin/main wno = log ..origin/master [user] name = Benjamin Pollack email = benjamin@bitquabit.com [color] ui = true [commit] verbose = true [core] editor = hx excludesfile = ~/.gitignore pager = delta quotepath = false [credential] helper = manager [delta] navigate = true dark = true [diff] algorithm = histogram colorMoved = default tool = difftastic [difftool] prompt = false [difftool "difftastic"] cmd = difft "$LOCAL" "$REMOTE" [fetch] prune = true showForcedUpdates = true [init] defaultBranch = main [interactive] diffFilter = delta --color-only [merge] conflictstyle = zdiff3 defaultToUpstream = true [pager] difftool = true [push] default = current [rerere] enabled = true [transfer] fsckObjects = true