Thu, 09 Mar 2023 12:45:11 -0600
Switch to kanagawa until themer's jellybeans is fixed
[user] email = mhoward@roomag.org name = Meredith Howard [github] user = merrilymeredith [init] defaultBranch = main [alias] ci = commit rec = commit -p unrec = checkout --patch amend = commit -p --amend st = status -sb co = checkout br = branch brd = diff @{u}... brf = diff --name-only @{u}... staged = diff --cached unstage = reset HEAD -- rollback = reset --soft ^HEAD histedit = rebase -i --autosquash --onto @{u}... @{u} pushf = push --force-with-lease up = pull update = "!git remote update -p && git merge --ff-only --stat @{u}" in = "!git remote update -p; git log --pretty=onelinecustom ..@{u}" out = "!git log --pretty=onelinecustom @{u}.." new = "!git log --pretty=onelinecustom $1@{1}..$1@{0}" glog = log --graph --pretty=onelinecustom recent = "!f() { git for-each-ref --count=20 --sort=-committerdate --format=\"%(committerdate:short) %(refname:short)\" ${1:-refs/heads} ${@:2}; }; f" orphan = "!f() { git fsck --dangling | grep commit | cut -d' ' -f3 | xargs git show --compact-summary; }; f" fork-point = merge-base --fork-point @{u} [pretty] onelinecustom = tformat:%C(magenta)%h%Creset %G? -%C(yellow)%d%Creset %s %C(green)(%cr)%Creset %C(cyan)<%an>%Creset [ui] color = true [core] pager = LESS=FSRXi less [gpg] program = "gpg2" [merge] tool = vimdiff3 guitool = gvimdiff conflictstyle = diff3 [branch] autosetupmerge = always [commit] verbose = true gpgsign = true [diff] compactionheuristic = true [pull] rebase = true [push] default = current [fetch] prune = true [rebase] autostash = true stat = true [transfer] fsckobjects = false [fetch "fsck"] zeroPaddedFilemode = ignore badDate = ignore badTimezone = ignore # include.path is available in git 1.7.10 and later [include] path = ~/.gitconfig.local # vim: noet:ts=8:sw=8