mirror of
https://github.com/mikkelsvartveit/dotfiles.git
synced 2025-12-22 19:22:38 +00:00
26 lines
728 B
Text
26 lines
728 B
Text
[user]
|
|
name = Mikkel Svartveit
|
|
email = mikkel.svartveit@gmail.com
|
|
[core]
|
|
excludesfile = ~/.config/git/gitignore_global
|
|
editor = nvim
|
|
[init]
|
|
defaultBranch = main
|
|
[pull]
|
|
rebase = false
|
|
[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
|
|
[alias]
|
|
yield = !git pull --rebase --autostash && git push
|
|
yolofix = !git commit -v -a --no-edit --amend && git push --force-with-lease
|