Skip to content

Instantly share code, notes, and snippets.

@mnabila

mnabila/.gitconfig

Forked from huytd/.gitconfig
Created August 31, 2019 05:48
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save mnabila/b04c219a216cf8741476226b972e7c1a to your computer and use it in GitHub Desktop.
Save mnabila/b04c219a216cf8741476226b972e7c1a 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