[home.git] / .gitconfig

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

[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

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

[push]
	default = current

[alias]
	a    = add
	ab   = abandon
	am-a = am --abort
	am-c = am --continue
	ar   = archive
	b    = branch -v
	bi   = bisect
	cfg  = config
	ci   = commit
	co   = checkout
	cp   = cherry-pick --ff
	cp-a = cherry-pick --abort
	cp-c = cherry-pick --continue
	cp-x = cherry-pick -x
	d    = diff
	desc = describe
	dl   = download
	f    = fetch
	fp   = format-patch -C -M
	g    = grep
	h    = help
	l    = log
	m    = merge
	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
	up   = upload

[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

[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
Commit	Line	Data
	1	[user]
	2	name = Mike Frysinger
	3	email = vapier@gentoo.org
	4	# signingkey = 0xE837F581
	5
	6	[core]
	7	abbrev = 12
	8	pager = less -FRMX --tabs 4 -#10
	9
	10	[color]
	11	ui = auto
	12	diff = auto
	13	status = auto
	14
	15	[color "diff"]
	16	old = red bold
	17	new = green bold
	18	plain = blue bold
	19	frag = yellow bold
	20	whitespace = normal green
	21	meta = magenta
	22
	23	[diff]
	24	renames = true
	25
	26	#[pager]
	27	# diff = diff-highlight \| less
	28	# log = diff-highlight \| less
	29	# show = diff-highlight \| less
	30
	31	[push]
	32	default = current
	33
	34	[alias]
	35	a = add
	36	ab = abandon
	37	am-a = am --abort
	38	am-c = am --continue
	39	ar = archive
	40	b = branch -v
	41	bi = bisect
	42	cfg = config
	43	ci = commit
	44	co = checkout
	45	cp = cherry-pick --ff
	46	cp-a = cherry-pick --abort
	47	cp-c = cherry-pick --continue
	48	cp-x = cherry-pick -x
	49	d = diff
	50	desc = describe
	51	dl = download
	52	f = fetch
	53	fp = format-patch -C -M
	54	g = grep
	55	h = help
	56	l = log
	57	m = merge
	58	rb = rebase
	59	rb-d = rebase --committer-date-is-author-date
	60	rb-a = rebase --abort
	61	rb-c = rebase --continue
	62	rb-i = rebase --interactive
	63	rb-s = rebase --skip
	64	rl = rev-list
	65	se = send-email -C -M
	66	sm = submodule
	67	st = status
	68	t = tag
	69	up = upload
	70
	71	[tag]
	72	sort = version:refname
	73
	74	[merge]
	75	conflictstyle = diff3
	76
	77	[rebase]
	78	autosquash = true
	79
	80	[http]
	81	cookiefile = ~/.gitcookies
	82
	83	[transfer]
	84	# https://groups.google.com/forum/m/#!topic/binary-transparency/f-BI4o8HZW0
	85	fsckobjects = true
	86
	87	[merge "merge-changelog"]
	88	name = GNU-style ChangeLog merge driver
	89	driver = /usr/bin/git-merge-changelog %O %A %B
	90
	91	[sendemail]
	92	chainreplyto = false
	93	confirm = always
	94	suppressfrom = true
	95	suppresscc = author
	96	smtpserver = localhost:1111