gitconfig

[user]
	name = skittlyoaten
	email = skittlyoaten@gmail.com
[color]
	ui = true
[alias]
	mylog = log --pretty=format:'%C(yellow)%h%Creset %C(bold blue)<%an>%Creset %C(red)%d%Creset %s %Cgreen(%cr) ' --abbrev-commit --date=short --branches
	s = status
	sb = status -sb
	undo = reset --soft HEAD~1
[core]
	excludesfile = ~/.gitignore
	#editor = subl -n -w
	editor = code --wait
	ignorecase = false
	trustctime = true
[push]
	default = current
[help]
	autocorrect = 15
# [diff]
# 	tool = diffmerge
# [difftool "diffmerge"]
# 	cmd = /usr/local/bin/diffmerge \"$LOCAL\" \"$REMOTE\"
# [merge]
# 	tool = diffmerge
# [mergetool "diffmerge"]
# 	cmd = /usr/local/bin/diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
# 	trustExitCode = true
# [merge]
# 	tool = sublimerge
# [mergetool "sublimerge"]
# 	cmd = subl -n --wait \"$REMOTE\" \"$BASE\" \"$LOCAL\" \"$MERGED\" --command \"sublimerge_diff_views\"
# 	trustExitCode = false
# [diff]
# 	tool = sublimerge
# [difftool "sublimerge"]
# 	cmd = subl -n --wait \"$REMOTE\" \"$LOCAL\" --command \"sublimerge_diff_views {\\\"left_read_only\\\": true, \\\"right_read_only\\\": true}\"

[merge]
	tool = vscode
[mergetool]
	keepBackup = false
[mergetool "vscode"]
	cmd = code --wait --new-window $MERGED
[diff]
	tool = vscode
[difftool "vscode"]
	cmd = code --wait --diff --new-window $LOCAL $REMOTE
[rerere]
	enabled = true