gitconfig

[user]
	name = Tim Hockin
	email = thockin@google.com
[include]
	path = ~/.gitconfig.local
[alias]
	co = checkout
	ci = commit
	st = status
	br = branch
	revert = checkout --
	amend = commit --amend
	ama = commit --amend -a
	curbr = "!f() { \
	    if [ ! -f .git/rebase-merge/head-name ]; then \
	        git rev-parse --abbrev-ref HEAD; \
	    else \
	        echo -n \"rb($(basename \"$(cat .git/rebase-merge/head-name)\")\"; \
	        if [ -f .git/rebase-merge/stopped-sha ]; then \
	            echo -n ',stopped'; \
	        fi; \
	        if (( $(git diff --name-only --diff-filter=U --relative | wc -l) != 0 )); then \
	            echo -n ',conflict'; \
	        fi; \
	        echo ')'; \
	    fi; \
	}; f"
	root = rev-parse --show-toplevel
	set-upstream = remote set-head upstream
	reset-upstream = remote set-head upstream --auto
	head = "!f() { \
	    if [ -z \"$1\" ]; then \
	        echo 'error: no remote specified' >&2; \
	        return 1; \
	    fi; \
	    git symbolic-ref refs/remotes/$1/HEAD; \
	}; f"
	mbr = "!f() { \
	    if ! git head upstream >/dev/null 2>&1; then \
	        git reset-upstream; \
	    fi; \
	    set -o pipefail; \
	    git head upstream | cut -f4 -d/; \
	}; f"
	fup = fetch upstream
	rb = rebase
	rbup = "!f() { \
	    echo \"Rebasing onto $(git mbr)\"; \
	    git rebase upstream/$(git mbr) \"$@\"; \
	}; f"
	po = push origin
	pocur = !git po $(git curbr)
	pofcur = !git po -f $(git curbr)
	wdiff = diff --color-words
	safebr = "!f() { git co master || git co main; }; f"
	track = "!f() { \
	    if [ -z \"$1\" ]; then \
	        echo 'error: no remote or branch specified' >&2; \
	        return 1; \
	    fi; \
	    rmt=upstream; \
	    br=$1; \
	    if [ -n \"$2\" ]; then \
	        rmt=$1; \
	        br=$2; \
	    fi; \
	    git fetch $rmt $br && git co -b $br $rmt/$br; \
	}; f"
	retrack = "!f() { \
	    if [ -z \"$1\" ]; then \
	        echo 'error: no remote or branch specified' >&2; \
	        return 1; \
	    fi; \
	    rmt=upstream; \
	    br=$1; \
	    if [ -n \"$2\" ]; then \
	        rmt=$1; \
	        br=$2; \
	    fi; \
	    git safebr; \
	    if [ -n \"$(git br -l $br)\" ]; then \
	        git br -D $br || return 1; \
	    fi; \
	    git track $rmt $br; \
	}; f"
	copr = "!f() { \
	    if [ -z \"$1\" ]; then \
	        echo 'error: no remote or PR specified' >&2; \
	        return 1; \
	    fi; \
	    rmt=upstream; \
	    pr=$1; \
	    if [ -n \"$2\" ]; then \
	        rmt=$1; \
	        pr=$2; \
	    fi; \
	    git fetch $rmt pull/$pr/head:pr-$rmt-$pr; \
	    git co pr-$rmt-$pr; \
	}; f"
	recopr = "!f() { \
	    if [ -z \"$1\" ]; then \
	        echo 'error: no remote or PR specified' >&2; \
	        return 1; \
	    fi; \
	    rmt=upstream; \
	    pr=$1; \
	    if [ -n \"$2\" ]; then \
	        rmt=$1; \
	        pr=$2; \
	    fi; \
	    git safebr; \
	    git br -D pr-$rmt-$pr; \
	    git copr $rmt $pr; \
	}; f"
	wip = for-each-ref --sort='committerdate:iso8601' --format=' %(color:green)%(committerdate:relative)%09%(color:white)%(refname:short)' refs/heads
	my = "!f() { \
	    git log --reverse --no-show-signature --format='format:%C(auto)%h  %s' upstream/$(git mbr)..HEAD; echo; \
	}; f"
	vs = "!f() { \
	    up=$1; \
	    test -z \"$1\" && up=upstream/$(git mbr); \
	    echo $up; \
	    git log --reverse --no-show-signature --format='format:%C(auto)%h  %s' ${up}..HEAD; echo; \
	}; f"
	unstage = restore --staged
	kys = "!f() { \
	    curbr=$(git curbr); \
	    echo \"Nuking $curbr\"; \
	    sleep 3; \
	    git safebr && git br -D $curbr; \
	}; f"
[core]
	editor = "vim +0"
	excludesFile = ~/.gitignore
        pager = diff-so-fancy | less --tabs=4 -RF
[merge]
	conflictstyle = zdiff3
	renamelimit = 4096
[push]
	default = current
	autoSetupRemote = true
[diff]
	algorithm = histogram
	srcPrefix = ""
	dstPrefix = ""
	#colorMoved = default
	#colorMovedWS = ignore-space-change
[http "https://gopkg.in"]
	followRedirects = true
[advice]
	detachedHead = false
	skippedCherryPicks = false
[rerere]
	enabled = false
[gpg]
	format = ssh
[gpg "ssh"]
	allowedSignersFile = /home/thockin/.ssh/allowed_signers
[commit]
	gpgsign = true
[tag]
	gpgsign = true
	sort = -version:refname
[pull]
	rebase = true
[log]
	showSignature = true
[filter "lfs"]
	clean = git-lfs clean -- %f
	smudge = git-lfs smudge -- %f
	process = git-lfs filter-process
	required = true
[init]
	defaultBranch = main
[url "git@github.com:"]
	insteadOf = "gh://"
[transfer]
	fsckobjects = true
[fetch]
	fsckobjects = true
[receive]
	fsckObjects = true
[interactive]
	diffFilter = diff-so-fancy --patch
[diff-so-fancy]
	markEmptyLines = false
	changeHunkIndicators = false
	stripLeadingSymbols = false
	#rulerWidth = 80
	useUnicodeRuler = false
[color]
	ui = true
[color "diff-highlight"]
	oldNormal = red bold
	oldHighlight = red bold 52
	newNormal = green bold
	newHighlight = green bold 22
[color "diff"]
	meta = 11
	frag = magenta bold
	func = 146 bold
	commit = yellow bold
	old = red bold
	new = green bold
	whitespace = red reverse