.gitconfig

# This is Git's per-user configuration file.
[user]
	name = Gary Miguel
	email = garymm@garymm.org
[http]
	cookiefile = ~/.gitcookies
[grep]
	extendedRegexp = true
[pager]
	branch = false
[alias]
	amend = commit --all --amend --no-edit
	icd = icdiff
	log-graph = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
	dt = difftool
	rbc = rebase --continue
	rbom = rebase origin/master
	psh = push --force-with-lease
	dlog = "!f() { : git log ; GIT_EXTERNAL_DIFF=difft git log -p --ext-diff $@; }; f"
	difft = difftool --tool=difftastic
	diffstash = difftool stash^!
[icdiff]
	options = --line-numbers
[diff]
	tool = vscode
[difftool]
	prompt = false
[difftool "vscode"]
	cmd = ~/bin/editor.sh --diff $LOCAL $REMOTE
[difftool "difftastic"]
	cmd = difft "$LOCAL" "$REMOTE"
[merge]
	tool = vscode
[mergetool "vscode"]
	cmd = ~/bin/editor.sh --merge $REMOTE $LOCAL $BASE $MERGED
[log]
	# opt in to new behavior to supress warning messages
	mailmap = true
	date = format-local:%Y-%m-%d %H:%M:%S
[pull]
	ff = only
[push]
	recurseSubmodules = check
	default = current
[init]
	defaultBranch = master
[advice]
    setUpstreamFailure = false
	skippedCherryPicks = false
[rebase]
	autosquash = true