mirror of
https://github.com/dnlbauer/dotfiles.git
synced 2026-09-10 13:35:30 +00:00
feat: add nbdime
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user