noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2024-11-09 23:22:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

squelch git message about default pull conflicts

Browse Source
This commit is contained in:
Noah Masur 2020-11-29 09:47:30 -05:00
parent 2f90cee237
commit c408e814e0
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git/gitconfig.symlink
View File

@ -12,3 +12,5 @@
branch = false branch = false
[core] [core]
editor = nvim editor = nvim
[pull]
ff = only