.gitconfig

[includeIf "gitdir:/Users/vsb/projects/work/**"]
    path = ~/.config/git/work.gitconfig

[credential]
	help = osxkeychain
[push]
	default = current
	autoSetupRemote = true
[core]
	editor = nvim --clean -u NONE
	excludesfile = /Users/vsb/.global_ignore
	pager = delta
[color]
	ui = true
[alias]
	co = checkout
	br = branch -vv
	ci = commit
	st = status
	unstage = reset HEAD --
	last = log -1 HEAD
  lol = log --graph --decorate --pretty=oneline --abbrev-commit
  lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
	squash-all = "!f(){ git reset $(git commit-tree HEAD^{tree} -m \"${1:-A new start}\");};f"
	staash = stash --all
	# Worktree workflow — work on branches, land from main
	wt = worktree list
	wta = "!f(){ git worktree add -b \"$1\" \"$(git rev-parse --show-toplevel)/../$1\" main; };f"
	wtrm = "!f(){ git worktree remove \"$1\"; };f"
	land = "!f(){ branch=\"${1:?usage: git land <branch>}\"; [ \"$(git symbolic-ref --short HEAD)\" = main ] || { echo \"error: not on main\" >&2; return 1; }; git rebase main \"$branch\" && git checkout main && git merge --ff-only \"$branch\" && echo \"Landed $branch on main.\"; };f"
	gp = push
[http]
	postBuffer = 524288000
[github]
	user = vsbuffalo
[diff "nb2md"]
	textconv = nb2md
[init]
	defaultBranch = main
[pull]
	rebase = true
[fetch]
	prune = true
[rebase]
	autosquash = true
[filter "lfs"]
	clean = git-lfs clean -- %f
	smudge = git-lfs smudge -- %f
	process = git-lfs filter-process
	required = true
[user]
    name = Vince Buffalo
    email = vsbuffalo@gmail.com
[interactive]
	diffFilter = delta --color-only
[delta]
	navigate = true
[merge]
	conflictStyle = zdiff3