add macos dotfiles
This commit is contained in:
23
macOS/.gitconfig
Normal file
23
macOS/.gitconfig
Normal file
@@ -0,0 +1,23 @@
|
||||
[merge]
|
||||
tool = kdiff3
|
||||
[user]
|
||||
name = Mark Schmitz
|
||||
email = mark.schmitz@mailbox.org
|
||||
[alias]
|
||||
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
|
||||
[filter "lfs"]
|
||||
process = git-lfs filter-process
|
||||
required = true
|
||||
clean = git-lfs clean -- %f
|
||||
smudge = git-lfs smudge -- %f
|
||||
[difftool "Kaleidoscope"]
|
||||
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
|
||||
[mergetool "Kaleidoscope"]
|
||||
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
|
||||
trustexitcode = true
|
||||
[core]
|
||||
excludesfile = /Users/mark/.config/git/ignore
|
||||
[pull]
|
||||
rebase = false
|
||||
[init]
|
||||
defaultBranch = main
|
||||
Reference in New Issue
Block a user