feat: add nbdime

This commit is contained in:
Daniel Bauer
2026-04-17 10:32:22 +02:00
parent 3179c0b2b9
commit 77d8f02e0d
3 changed files with 31 additions and 2 deletions

View File

@@ -7,7 +7,7 @@
pager = sh -c 'command -v diff-so-fancy >/dev/null && exec diff-so-fancy || less --tabs=4 -RX'
pager = less
autocrlf = input
attributesFile = /home/dbauer/.gitattributes
attributesFile = {{ .chezmoi.homeDir }}/.gitattributes
[alias]
co = commit
ch = checkout
@@ -56,3 +56,16 @@
program = /usr/bin/gpg
[include]
path = ~/.gitconfig.local
[diff "jupyternotebook"]
command = git-nbdiffdriver diff
[merge "jupyternotebook"]
driver = git-nbmergedriver merge %O %A %B %L %P
name = jupyter notebook merge driver
[difftool "nbdime"]
cmd = git-nbdifftool diff \"$LOCAL\" \"$REMOTE\" \"$BASE\"
[difftool]
prompt = false
[mergetool "nbdime"]
cmd = git-nbmergetool merge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
[mergetool]
prompt = false