This repository has been archived on 2024-03-28. You can view files and clone it, but cannot push or open issues or pull requests.
dotfiles/apps/git/config

33 lines
603 B
Plaintext
Raw Normal View History

[push]
default = matching
[user]
name = Daniel Flanagan
email = daniel@lytedev.io
[core]
editor = nvim
pager = 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' -
[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'