[push] default = matching [user] name = Daniel Flanagan email = daniel@lytedev.io [core] editor = nvim pager = less -r [http "https://gopkg.in"] followRedirects = true [diff] tool = nvimdiff [difftool] prompt = false [alias] d = difftool [merge] tool = nvimdiff conflictstyle = diff3 [mergetool] prompt = false [mergetool "nvimdiff"] cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' [push] default = current [pager] branch = false diff = nvim -c 'silent %sm/\\e.\\{-}m//g' -c 'silent %s/^diff/\\r\\rdiff/' -c 'silent set ft=diff' -c 'silent setlocal nobuflisted buftype=nofile bufhidden=wipe noswapfile' -c 'goto 1' -