Content Comparison

git config --list --show-origin  # Viser hvor konfig-filene er lagret

[user]
	email = 81353974+arneso-ssb@users.noreply.github.com
	name = Arne Sørli
[core]
	autocrlf = input
    eol = lf
[diff]
	tool = bc
[diff "ipynb"]
	textconv = C:/Users/aei/AppData/Local/Programs/Python/Python310/python.exe -m nbstripout -t
[difftool "bc"]
	path = C:/Program Files/Beyond Compare 4/bcomp.exe
[difftool]
	prompt = false
[fetch]
	prune = true
[filter "nbstripout"]
	clean = C:/Users/aei/AppData/Local/Programs/Python/Python310/python.exe -m nbstripout
	smudge = cat
	required = true
	extrakeys = metadata.kernelspec metadata.language_info.version cell.metadata.pycharm metadata.language_info.pygments_lexer metadata.language_info.codemirror_mode.version
[merge]
	tool = bc
[mergetool "bc"]
	path = C:/Program Files/Beyond Compare 4/bcomp.exe

git config --global diff.tool meld             # Setter meld som diff-verktøy
git config --global difftool.prompt false      # Slipp å bli spurt om du vil åpne meld
git config --global merge.tool meld            # Setter meld som merge-verktøy
git config --global mergetool.prompt false
git config --global mergetool.keepBackup false # Unngå at meld oppretter .orig backup-filer
git config mergetool.meld.useAutoMerge auto    # Automerge endringer som ikke er konflikter
git config --global mergetool.meld.path "C:/Program Files/Meld/Meld.exe"