gitconfig

[alias]
	a = add
	aa = add --all
	amend = commit --amend --no-edit
	br = branch
	st = status -sb
	ci = commit
	co = checkout
	cp = cherry-pick
	di = diff
	dc = diff --cached
	fm = merge --no-ff
	ff = merge --ff
	freeze = "!~/.githelpers freeze"
	h = "!f() { git log --graph --abbrev-commit --color=always --pretty=format:\"%C(yellow)%h%Creset}%Cgreen(%ai)%Creset}%C(bold blue)%an <%ae>%Creset}%C(red)%d%Creset}%s\" \"$@\" | sed -Ee \"s/ ([0-9]{2}:[0-9]{2}):[0-9]{2} \\\\+[0-9]{4}/ \\\\1/\" | colorcolumn FS=\"}\" | less -FXRS; }; f"
	largest = "!~/.githelpers largest"
	man = help
	s = switch
	thaw = "!~/.githelpers thaw"
	unadd = reset HEAD
	upstream = "!f() { br=$(git rev-parse --abbrev-ref HEAD); merge=$(git config branch.${br}.merge); echo $(git config branch.${br}.remote)/${merge##refs/heads/}; }; f"
[color]
	branch = auto
	diff = auto
	interactive = auto
	status = auto
[core]
	commitGraph = true
	excludesfile = ~/.gitignore
	quotepath = false
	trustctime = false
[diff]
	noprefix = true
[difftool "filemerge"]
	cmd = /usr/bin/opendiff $LOCAL $REMOTE
[difftool "sourcetree"]
	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
	path = 
[gc]
	writeCommitGraph = true
[gui]
	fontui = -family \"Lucida Grande\" -size 12 -weight normal -slant roman -underline 0 -overstrike 0
	fontdiff = -family Menlo -size 12 -weight normal -slant roman -underline 0 -overstrike 0
[hub]
	protocol = https
[init]
	defaultBranch = main
[merge]
	tool = p4mergetool
	autoStash = true
[mergetool]
	keepBackup = false
[mergetool "diffmerge"]
	cmd = /Applications/DiffMerge.app/Contents/MacOS/DiffMerge --merge -result=$MERGED $LOCAL $BASE $REMOTE
	trustExitCode = false
[mergetool "p4mergetool"]
	cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge $PWD/$BASE $PWD/$REMOTE $PWD/$LOCAL $PWD/$MERGED
	trustExitCode = false
[mergetool "gvim"]
	path = /usr/local/bin/mvim
[mergetool "gvimdiff"]
	path = /usr/local/bin/mvim
[mergetool "sourcetree"]
	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
	trustExitCode = true
[pull]
	rebase = true
[push]
	default = upstream
	autoSetupRemote = true
[rerere]
	enabled = true
[include]
	path = "~/.gitconfig.local"
[http]
	followRedirects = true
[filter "lfs"]
	required = true
	clean = git-lfs clean -- %f
	smudge = git-lfs smudge -- %f
	process = git-lfs filter-process
[rebase]
	autoStash = true