.gitconfig

[diff "visual"]
	command = "git-wrapper-visual-diff"

[am]
	threeWay = true

[core]
	abbrev = 12

[color]
	ui = auto

[commit]
	verbose = 1

[log]
	date = format:%a %Y-%m-%d %H:%M:%S

[pretty]
	fixes = Fixes: %h (%ad, \"%s\")
	ref = commit %h (%ad, %an: \"%s\")
	shortref = commit %h (\"%s\")

[alias]
	b4 = "!f() { b4 am -l -t -o - $1 | git am -s; }; f"

	st = status
	br = branch
	fopa = format-patch --notes --indent-heuristic --no-renames -N --no-signature --summary --stat=80
	bi = bisect
	sub = submodule

	# amq: see ~/bin/git-amq

	f = fetch
	pu = push
	pull = pull --no-stat
	pur = pull --no-stat --rebase
	puf = push --force-with-lease

	a = add -p

	chp = cherry-pick
	chpc = cherry-pick --continue

	ci = commit
	cia = commit --all
	ciam = commit --all -m.
	cis = commit --signoff
	cisa = commit --signoff --all
	amend = commit --amend
	fix = commit --fixup
	sq  = commit --squash

	d = diff
	di = diff
	dif = diff
	ca = diff --cached
	cached = diff --cached
	full     = show --pretty=fuller
	stat     = show --stat=100000 --stat-graph-width=40
	fullstat = show --stat=100000 --stat-graph-width=40
	fulldiff = diff -p --no-prefix -U20000

	# use 'git set-default-branch refs/heads/origin/master' or similiar
	set-default-branch = symbolic-ref refs/heads/DEFAULT_BRANCH
	rdd = !"f() { git range-diff refs/heads/DEFAULT_BRANCH ${1:-'@{u}'} ${2:-HEAD}; }; f"
	ld = graph --boundary refs/heads/DEFAULT_BRANCH...@ refs/heads/DEFAULT_BRANCH...@{u}

	co = checkout
	cop = checkout -p

	rep = reset -p
	hard = reset --hard
	rehead = reset HEAD
	reco = !sh -c 'git reset HEAD && git checkout .'
	redo = !sh -c 'git reset --soft $(git merge-base master HEAD)'

	pop = stash pop
	stp = stash pop
	sts = stash save

	sl = log --oneline --no-decorate
	ol = log --format='%C(auto)%h %C(blue)%ad %C(green)(%an) %C(reset)%s'
	lastlog = log --graph HEAD@{1}..HEAD --format='%C(auto)%h %C(blue)%ad %C(green)(%an) %C(reset)%s'
	fetchlog = log --graph HEAD..FETCH_HEAD --format='%C(auto)%h %C(blue)%ad %C(green)(%an) %C(reset)%s'
	graph = log --graph --pretty='%C(auto)%h%d %C(blue)%ad %C(green)(%an)%C(reset) %s' --abbrev-commit
	g     = graph '@{u}^..@'
	gr    = graph
	gra   = graph --branches --tags --remotes

	fixes = show --no-patch --no-notes --date="format:%Y-%m-%d" --pretty=fixes --abbrev=20
	urlref= !sh -c "'git ref \"$@\"; echo; git url \"$@\"'" --                                # "URL reference"
	url   = show --no-patch --no-notes --pretty=url --abbrev=20                               # uses pretty.url from repo's .git/config
	ref   = show --no-patch --no-notes --date="format:%Y-%m-%d" --pretty=ref --abbrev=20      # "reference format"
	cite  = !sh -c "'git longref \"$@\"; echo; git url \"$@\"'" --                            # "full reference/citation format"
	longref = show --no-patch --no-notes                                                      # "long reference format"
	shortref = show --no-patch --no-notes --pretty=shortref --abbrev=20                       # "short reference format'

	rb = rebase
	rbi = rebase -i
	rbin = rebase -i --no-autosquash
	rbc = rebase --continue
	rbd = rebase -i refs/heads/DEFAULT_BRANCH

	im  = imerge merge
	imc = imerge continue
	imr = imerge rebase

	assume-unchanged = update-index --assume-unchanged
	no-assume-unchanged = update-index --no-assume-unchanged
	really-status = update-index --really-refresh

	svr = svn rebase
	svd = svn dcommit
	sv = !sh -c 'git svn rebase && git svn dcommit'

	noa = notes add -m

[core]
	excludesfile = ~/.gitrc/ignore

[cola]
	fontdiff = Terminus,8,-1,5,50,0,0,0,0,0
	tabwidth = 4
	spellcheck = false

[gui]
	editor = vi
	historybrowser = gitk

[pager]
	log = diff-highlight | less
	show = diff-highlight | less
	diff = diff-highlight | less

[diff]
	tool = meld
	compactionHeuristic = true      # git 2.9

[merge]
	tool = meld
	defaultToUpstream = true

[pull]
	ff = only

[push]
	default = simple

[rebase]
	autoSquash = true
	autoStash = true
	missingCommitsCheck = warn
	instructionFormat = %ai [%<(18,trunc)%an]%d %s

[achievement]
	upload = false

[bash]
	showDirtyState = true

[remote-hg]
	hg-git-compat = true

[init]
	templatedir = ~/.gitrc/init-template/
	defaultBranch = main

[submodule]
	fetchJobs = 4      # git 2.9
[fetch]
	recurseSubmodules = false
[sendemail]
	confirm = always
	envelopesender = auto
	assume8bitEncoding = utf8
	composeencoding = utf8
	transferEncoding = auto

[stash]
	showPatch = true
	showStat = true

[notes]
	rewriteRef = refs/notes/commits