christian/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

stuff

Browse Source
This commit is contained in:
Christian Nieves
2023-10-24 15:15:11 -05:00
parent 0a72887b64
commit cf131d7d17
4 changed files with 39 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
git/.gitconfig
View File

@ -37,9 +37,11 @@
po = push origin
[core]
autocrlf = false
[icdiff]
options = --highlight --line-numbers
[merge]
tool = "nvim"
[mergetool "nvim"]
cmd = nvim -d -c \"wincmd l\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\"
[diff]
tool = icdiff