[home.git] / .gitconfig

[user]
	name = Mike Frysinger
	email = vapier@gentoo.org
#	signingkey = 0xE837F581

[advice]
	detachedHead = false

[core]
	abbrev = 12
	pager = less -FRMX --tabs 4 -#10

[color]
	ui = auto
	diff = auto
	status = auto

[color "diff"]
	old = red bold
	new = green bold
	plain = blue bold
	frag = yellow bold
	whitespace = normal green
	meta = magenta

[diff]
	renames = true

[fetch]
	parallel = 4

# Settings used by Chromium's `git cl`.  The defaults are brain-dead.
[gerrit]
	skip-ensure-authenticated = true
	squash-uploads = false

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

[protocol]
	# https://opensource.googleblog.com/2018/05/introducing-git-protocol-version-2.html
	version = 2

[pull]
	ff = only

[push]
	default = current

[alias]
	a    = add
	am-a = am --abort
	am-c = am --continue
	ar   = archive
	b    = branch -v
	bi   = bisect
	cfg  = config
	ci   = commit
	cia  = commit -a
	ciaf = commit -a --fixup
	ciam = commit --amend
	ciaam = commit --amend -a
	cif  = commit --fixup
	co   = checkout
	cp   = cherry-pick --ff
	cp-a = cherry-pick --abort
	cp-c = cherry-pick --continue
	cp-x = cherry-pick -x
	d    = diff
	dc   = diff --cached
	desc = describe
	f    = fetch
	fp   = format-patch -C -M
	g    = grep
	h    = help
	l    = log
	lf   = log --format= --name-only
	m    = merge --log=100 --no-stat
	rb   = rebase
	rb-d = rebase --committer-date-is-author-date
	rb-a = rebase --abort
	rb-c = rebase --continue
	rb-i = rebase --interactive
	rb-s = rebase --skip
	rl   = rev-list
	se   = send-email -C -M
	sm   = submodule
	st   = status
	t    = tag
	vl   = log --pretty='format:%Cred%h%Creset %Cgreen%ai%Creset %s%C(bold)%C(yellow)%d%Creset'

[tag]
	sort = version:refname

[merge]
	conflictstyle = diff3

[rebase]
	autosquash = true

[http]
	cookiefile = ~/.gitcookies

[transfer]
	# https://groups.google.com/forum/m/#!topic/binary-transparency/f-BI4o8HZW0
	fsckobjects = true

[init]
	defaultBranch = main

[merge "merge-changelog"]
	name = GNU-style ChangeLog merge driver
	driver = /usr/bin/git-merge-changelog %O %A %B

[sendemail]
	chainreplyto = false
	confirm = always
	suppressfrom = true
	suppresscc = author
	smtpserver = localhost:1111
	transferEncoding = 8bit
#	composeencoding = utf-8
	assume8bitEncoding = 8bit
Commit	Line	Data
	1	[user]
	2	name = Mike Frysinger
	3	email = vapier@gentoo.org
	4	# signingkey = 0xE837F581
	5
	6	[advice]
	7	detachedHead = false
	8
	9	[core]
	10	abbrev = 12
	11	pager = less -FRMX --tabs 4 -#10
	12
	13	[color]
	14	ui = auto
	15	diff = auto
	16	status = auto
	17
	18	[color "diff"]
	19	old = red bold
	20	new = green bold
	21	plain = blue bold
	22	frag = yellow bold
	23	whitespace = normal green
	24	meta = magenta
	25
	26	[diff]
	27	renames = true
	28
	29	[fetch]
	30	parallel = 4
	31
	32	# Settings used by Chromium's `git cl`. The defaults are brain-dead.
	33	[gerrit]
	34	skip-ensure-authenticated = true
	35	squash-uploads = false
	36
	37	[pager]
	38	diff = diff-highlight \| less
	39	log = diff-highlight \| less
	40	show = diff-highlight \| less
	41
	42	[protocol]
	43	# https://opensource.googleblog.com/2018/05/introducing-git-protocol-version-2.html
	44	version = 2
	45
	46	[pull]
	47	ff = only
	48
	49	[push]
	50	default = current
	51
	52	[alias]
	53	a = add
	54	am-a = am --abort
	55	am-c = am --continue
	56	ar = archive
	57	b = branch -v
	58	bi = bisect
	59	cfg = config
	60	ci = commit
	61	cia = commit -a
	62	ciaf = commit -a --fixup
	63	ciam = commit --amend
	64	ciaam = commit --amend -a
	65	cif = commit --fixup
	66	co = checkout
	67	cp = cherry-pick --ff
	68	cp-a = cherry-pick --abort
	69	cp-c = cherry-pick --continue
	70	cp-x = cherry-pick -x
	71	d = diff
	72	dc = diff --cached
	73	desc = describe
	74	f = fetch
	75	fp = format-patch -C -M
	76	g = grep
	77	h = help
	78	l = log
	79	lf = log --format= --name-only
	80	m = merge --log=100 --no-stat
	81	rb = rebase
	82	rb-d = rebase --committer-date-is-author-date
	83	rb-a = rebase --abort
	84	rb-c = rebase --continue
	85	rb-i = rebase --interactive
	86	rb-s = rebase --skip
	87	rl = rev-list
	88	se = send-email -C -M
	89	sm = submodule
	90	st = status
	91	t = tag
	92	vl = log --pretty='format:%Cred%h%Creset %Cgreen%ai%Creset %s%C(bold)%C(yellow)%d%Creset'
	93
	94	[tag]
	95	sort = version:refname
	96
	97	[merge]
	98	conflictstyle = diff3
	99
	100	[rebase]
	101	autosquash = true
	102
	103	[http]
	104	cookiefile = ~/.gitcookies
	105
	106	[transfer]
	107	# https://groups.google.com/forum/m/#!topic/binary-transparency/f-BI4o8HZW0
	108	fsckobjects = true
	109
	110	[init]
	111	defaultBranch = main
	112
	113	[merge "merge-changelog"]
	114	name = GNU-style ChangeLog merge driver
	115	driver = /usr/bin/git-merge-changelog %O %A %B
	116
	117	[sendemail]
	118	chainreplyto = false
	119	confirm = always
	120	suppressfrom = true
	121	suppresscc = author
	122	smtpserver = localhost:1111
	123	transferEncoding = 8bit
	124	# composeencoding = utf-8
	125	assume8bitEncoding = 8bit