sanchayanmaity
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git: Add support for using kitty as a difftool 

While at it drop unnecessary double quotes.
This commit is contained in:
Sanchayan Maity 2022-01-04 19:22:45 +05:30
parent 4ecaa955df
commit f3fdde252a
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
git/.gitconfig
View File

@ -3,7 +3,7 @@
email = sanchayan@sanchayanmaity.net email = sanchayan@sanchayanmaity.net
login = sanchayanmaity login = sanchayanmaity
[core] [core]
editor = "nvim" editor = nvim
pager = nvim -R pager = nvim -R
excludesfile = ~/.config/git/ignore excludesfile = ~/.config/git/ignore
[color] [color]
@ -18,8 +18,13 @@
pruneTags = true pruneTags = true
[diff] [diff]
tool = nvimdiff tool = nvimdiff
[difftool]
prompt = false
trustExitCode = true
[difftool "nvimdiff"] [difftool "nvimdiff"]
cmd = nvim -R -d "$LOCAL" "$REMOTE" cmd = nvim -R -d $LOCAL $REMOTE
[difftool "kitty"]
cmd = kitty +kitten diff $LOCAL $REMOTE
[merge] [merge]
tool = diffconflicts tool = diffconflicts
conflictstyle = diff3 conflictstyle = diff3
@ -28,7 +33,7 @@
prompt = false prompt = false
keepBackup = false keepBackup = false
[mergetool "diffconflicts"] [mergetool "diffconflicts"]
cmd = nvim -c DiffConflicts "$MERGED" "$BASE" "$LOCAL" "$REMOTE" cmd = nvim -c DiffConflicts $MERGED $BASE $LOCAL $REMOTE
trustExitCode = true trustExitCode = true
[rebase] [rebase]
autosquash = true autosquash = true