Skip to content

Instantly share code, notes, and snippets.

@francois-pasquier
Last active January 22, 2019 00:35
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 francois-pasquier/c206a7c1a23dc30a94e4d7b3f58636f9 to your computer and use it in GitHub Desktop.
Save francois-pasquier/c206a7c1a23dc30a94e4d7b3f58636f9 to your computer and use it in GitHub Desktop.
gitconfig
[diff]
tool = vimdiff
[difftool]
prompt = false
[merge]
tool = vimdiff
[mergetool]
prompt = true
[mergetool "vimdiff"]
cmd = nvim $MERGED -c 'Gdiff'
[alias]
d = difftool
[core]
pager = less -
[include]
path = .gitalias
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment