FunctionalHacker/dotfiles
FunctionalHacker/dotfiles
2
0
Fork 0
Code Issues 1 Pull requests 1 Releases Activity

Switch from nvimpager to just nvim as pager

Browse source
This commit is contained in:
Marko Korhonen 2021-08-17 17:43:30 +03:00
parent e5d07324a5
commit 9d3972a54a
3 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
home/.gitconfig
View file

@ -21,6 +21,7 @@
[merge]
prompt = false
tool = nvim-merge
[mergetool "nvim-merge"]
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
@ -36,3 +37,6 @@
[alias]
mergetest = !git switch test && git pull && git merge --no-ff -m \"Merge $1 features to test\" $1 && git push
[color]
pager = no