histalek/dotfiles
histalek/dotfiles
1
0
Fork 0
Code Releases Activity

feat(git): Play around with diffing via nvim

Browse source
This commit is contained in:
histalek 2024-01-19 16:37:54 +01:00
parent f24eea55a9
commit 3c29c6a3ff
Signed by: histalek
SSH key fingerprint: SHA256:6a6N2Wzk73nwURUHC/ubbCyqdB6yfie0Jv/NGvRcsIE
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.config/git/config
View file

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