Skip to content

Instantly share code, notes, and snippets.

@kirk91

kirk91/.gitconfig

Forked from huytd/.gitconfig
Created February 7, 2018 16:04
Show Gist options
  • Save kirk91/6470f6f0780737dbcebcb413e83008e9 to your computer and use it in GitHub Desktop.
Save kirk91/6470f6f0780737dbcebcb413e83008e9 to your computer and use it in GitHub Desktop.
Download ZIP
Use neovim as diff tool
Raw
.gitconfig
[merge]
tool = vimdiff
[mergetool]
prompt = true
[mergetool "vimdiff"]
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[difftool]
prompt = false
[diff]
tool = vimdiff
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment