diff options
| author | Toby Vincent <tobyv13@gmail.com> | 2022-07-13 10:54:56 -0500 |
|---|---|---|
| committer | Toby Vincent <tobyv13@gmail.com> | 2022-07-13 10:54:56 -0500 |
| commit | 31e41262e825b130f2f103befbd7986f458a87fa (patch) | |
| tree | 2fc81a1dc5e94aa49ffa3af385b90f0d2628c865 /git | |
| parent | 7eb7706b8fdf56dc84d1f59d17fe76869013c060 (diff) | |
feat(git): improve git diff and merge with proper nvim support
Diffstat (limited to 'git')
| -rw-r--r-- | git/.gitconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git/.gitconfig b/git/.gitconfig index 36eb23c..cf81f16 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -31,11 +31,11 @@ prune = true [advice] detachedHead = false -[diff] -tool = vscode +[merge] +tool = nvimdiff -[difftool "vscode"] -cmd = code --wait --diff $LOCAL $REMOTE +[mergetool "nvimdiff"] +layout = "MERGED" [trailer] separators = ":#" |