Last active
March 18, 2024 12:28
-
-
Save bjornblissing/8a57da7132d59f66d7fdd4c7a1216f92 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[gc] | |
autoDetach = false | |
[filter "lfs"] | |
clean = git-lfs clean -- %f | |
smudge = git-lfs smudge -- %f | |
process = git-lfs filter-process | |
required = true | |
[credential] | |
helper = manager | |
[core] | |
editor = 'C:/Program Files (x86)/Notepad++/notepad++.exe' -multiInst -notabbar -nosession -noPlugin | |
autocrlf = true | |
[init] | |
defaultBranch = main | |
[pull] | |
rebase = true | |
[alias] | |
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit | |
subup = submodule update --init --recursive | |
[mergetool] | |
prompt = false | |
keepBackup = false | |
keepTemporaries = false | |
[merge] | |
tool = winmerge | |
[mergetool "winmerge"] | |
name = WinMerge | |
trustExitCode = true | |
cmd = "'C:/Program Files/WinMerge/WinMergeU.exe'" -u -e -wl -wr -dl Local -dr Remote $LOCAL $MERGED $REMOTE | |
[diff] | |
tool = winmerge | |
[difftool "winmerge"] | |
name = WinMerge | |
trustExitCode = true | |
cmd = "'C:/Program Files/WinMerge/WinMergeU.exe'" -u -e -wl -dl Base -dr Local $LOCAL $REMOTE |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment