[user] email = andrew@andrewswistak.com name = Andrew Swistak signingkey = 666C20960EF30DE21A0C9866C3F4D60CA6D49CA0 [push] default = simple [merge] tool = vimdiff conflictstyle = diff3 summary = true [interactive] singlekey = true [core] editor = nvim -f pager = less -F -X excludesfile = ~/.gitignore [mergetool] prompt = false tool = vimdiff [diff] tool = vimdiff [mergetool "vimdiff"] cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd W' -c '$wincmd J' [alias] lol = log --oneline c = commit s = status cam = commit -am cane = commit --amend --no-edit cm = commit -m ca = commit -a d = diff ch = checkout chp = cherry-pick ctags = !.git/hooks/ctags [color] ui = auto diff = auto status = auto branch = auto interactive = auto grep = auto [url "github:"] insteadOf = git@github.com insteadOf = github.com [init] templatedir = ~/.git_template [diff "rails_credentials"] textconv = bin/rails credentials:diff