diff --git a/.config/git/config b/.config/git/config index 3b4b61d..0c2b572 100644 --- a/.config/git/config +++ b/.config/git/config @@ -4,7 +4,6 @@ signingkey = 19EC07547ED0CE82 [alias] - feature-branch = checkout -b force-push = push --force-with-lease ls-files = ls-tree --full-tree -r --name-only HEAD @@ -36,6 +35,12 @@ [diff] submodule = log + algorithm = patience + compationHeuristic = true + tool = nvimdiff + +[difftool "nvimdiff"] + cmd = nvim -d \"$LOCAL\" \"$REMOTE\" -c \"wincmd w\" -c \"wincmd L\" [gpg "ssh"] allowedSignersFile = ~/.config/git/allowed_signers