# vim: :foldmethod=marker

[include]
	path = ~/.config/git/local

[init]
	defaultBranch = main

[core]
	excludesFile = ~/.config/git/ignore
	quotepath = false
[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 {{{
[diff]
	tool = Kaleidoscope
[difftool]
	prompt = false
	trustExitCode = true
[merge]
	tool = Kaleidoscope
[mergetool]
	prompt = false
  conflictstyle = diff3
# }}}

# {{{ Neovim
[difftool "nvim"]
  cmd = nvim -d \"$LOCAL\" \"$REMOTE\"
[mergetool "nvim"]
  cmd = "nvim -d -c \"wincmd l\" -c \"norm ]c\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\""
# }}}

# {{{ 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
# }}}
[difftool "sourcetree"]
	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
	path = 
[mergetool "sourcetree"]
	cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
	trustExitCode = true
[user]
	name = Tony Miller
	email = aermolenko@atlassian.com
[trace2]
	eventTarget = af_unix:/Users/aermolenko/.gittrace/trace.sock
	eventBrief = true
	eventNesting = 1
	configparams = custom.metacommands