Tony Miller
c15d42808d
- Switch to use nvim difftool and mergetool - nvim plugins that make git integration better - db interface for vim with .env support
80 lines
1.4 KiB
Plaintext
80 lines
1.4 KiB
Plaintext
# vim: :foldmethod=marker
|
|
|
|
[include]
|
|
path = ~/.config/git/local
|
|
|
|
[init]
|
|
defaultBranch = main
|
|
|
|
[core]
|
|
excludesFile = ~/.config/git/ignore
|
|
quotepath = false
|
|
pager = delta
|
|
|
|
[interactive]
|
|
diffFilter = delta --color-only
|
|
|
|
[delta]
|
|
naviate = true
|
|
side-by-side = true
|
|
line-number = true
|
|
|
|
[pull]
|
|
rebase = true
|
|
|
|
[alias]
|
|
df = difftool
|
|
|
|
[filter "lfs"]
|
|
required = true
|
|
clean = git-lfs clean -- %f
|
|
smudge = git-lfs smudge -- %f
|
|
process = git-lfs filter-process
|
|
|
|
[push]
|
|
autoSetupRemote = true
|
|
|
|
# Diffs and Merges {{{
|
|
|
|
[difftool]
|
|
prompt = false
|
|
trustExitCode = true
|
|
|
|
[merge]
|
|
conflictStyle = zdiff3
|
|
|
|
[mergetool]
|
|
prompt = false
|
|
conflictstyle = diff3
|
|
# }}}
|
|
|
|
# {{{ Neovim
|
|
[difftool "nvim"]
|
|
cmd = nvim -d \"$LOCAL\" \"$REMOTE\"
|
|
[mergetool "nvim"]
|
|
cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
|
|
# }}}
|
|
|
|
# {{{ VSCode
|
|
[mergetool "vscode"]
|
|
cmd = code --wait --merge $REMOTE $LOCAL $BASE $MERGED
|
|
[difftool "vscode"]
|
|
cmd = code --wait --diff $REMOTE $LOCAL $BASE $MERGED
|
|
# }}}
|
|
|
|
# {{{ BBEdit
|
|
[difftool "bbdiff"]
|
|
cmd = bbdiff --resume \"$LOCAL\" \"$REMOTE\"
|
|
[mergetool "bbdiff"]
|
|
cmd = bbdiff --wait --resume \"$LOCAL\" \"$REMOTE\"
|
|
# }}}
|
|
|
|
# {{{ Kaleidoscope
|
|
[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
|
|
# }}}
|
|
|