summaryrefslogtreecommitdiff
path: root/.gitconfig
blob: 9dee7a322b71e1825a58e5c8df46e5eea2594452 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
# vim:noet:

[user]
	name = Mike Crute
	useConfigOnly = true
	#signingkey =

[github]
	user = mcrute

[core]
	whitespace = warn
	excludesfile = ~/.git-exclude
	pager = less -FMRiX
	quotepath = false

[alias]
	purge = clean -d -f
	compact = gc --aggressive --prune
	leader = shortlog -sn

	ignore = update-index --assume-unchanged
	unignore = update-index --no-assume-unchanged
	ignored = !git ls-files -v | grep '^[[:lower:]]'

	l = log --graph --abbrev-commit --date=relative

	st = status -sb
	rv = remote -v

	in = !"git l ..$(git rev-parse --abbrev-ref --symbolic-full-name @{upstream})"
	out = !"git l $(git rev-parse --abbrev-ref --symbolic-full-name @{upstream}).."

	ar = add -A
	ci = commit
	co = checkout
	rc = rebase --continue
	ri = rebase -i
	rs = rebase -i --autosquash
	dc = diff --cached
	rk = rm --cached
	ra = !git l --all -20
	lp = log --format=full -p -1
	lf = log --format=fuller -p
	ls = log --stat --format=fuller
	sl = !git l -n 10
	ca = commit -v --amend
	ap = add -p
	br = branch -a -vv
	ig = update-index --assume-unchanged
	os = !git out --stat
	of = !git out --format=full
	wd = diff --word-diff=color

	wdc = diff --cached --word-diff=color
	uig = update-index --no-assume-unchanged
	arp = add -A -p
	sup = submodule update --remote --merge
	dag = log --graph --format='format:%C(yellow)%h%C(reset) %C(blue)\"%an\" <%ae>%C(reset) %C(magenta)%cr%C(reset)%C(auto)%d%C(reset)%n%s' --date-order

	spush = push --recurse-submodules=on-demand
	made = log --reverse --format='format:%C(blue)%an%C(reset) <%ae> %C(green)(%ar)%C(reset)'
	taglist = show-ref --tags -d
	whoami = !git config -l | awk -F= '/^user.email/ { print $2 }'

	sync-subs = submodule update --init --checkout --recursive --force
	is-reviewed = !"GIT_EDITOR='git interpret-trailers --trailer \"Reviewed-by: $(git config user.name) <$(git config user.email)>\" --in-place' git commit --amend"

[color]
	ui = auto

[svn]
	rmdir = true

[format]
	pretty = format:%C(yellow)%h%Creset -%C(red)%d%Creset %<(60,trunc)%s %Cgreen(%ar) %C(bold blue)<%an>%Creset

[merge]
	tool = vimdiff
	ff = only

[rerere]
	enabled = true

[pull]
	rebase = true

[push]
	default = current

[branch]
	autosetuprebase = always

[status]
	submoduleSummary = true

[transfer]
	fsckobjects = true

[fetch]
	fsckobjects = true

[receive]
	fsckObjects = true

[trailer]
	ifexists = addIfDifferent

[clean]
	requireForce = false

[commit]
	verbose = true
	#gpgsign = true

#[tag]
#	gpgsign = true

[http]
	cookiefile = /home/mcrute/.gitcookies

[sendemail]
	smtpencryption = tls
	smtpserver = mail.messagingengine.com
	smtpserverport = 587

# Force the system-wide credential helper to nothing, otherwise on Mac OS the
# Apple provided one that uses keychain overrides the repository-local ones.
[credential]
	helper =

[git-pair]
	authors = Mike Crute <mike.crute@leandog.com>
	authors = Joe Fiorini <joe.fiorini@leandog.com>
	authors = Veezus Kreist <veezus.kreist@leandog.com>
	authors = Max Cantor <max@maxcantor.net>
	authors = Chris Weisel <chris.weisel@gmail.com>
	authors = Zee Spencer <zee@zacharyspencer.com>
	authors = Eric Hankinson <eric.hankinson@gmail.com>
	authors = Isaac Sanders <isaac.sanders@leandog.com>
	authors = Matt Odonnell <odonnell004@gmail.com>
	authors = Len Thomas <1970inazuma@gmail.com>
	authors = Michael Lemley <michael.lemley@leandog.com>
	authors = Huey Peterson <eyston@gmail.com>

# Context-specific Config Overrides
#
# These have to come last. Config sections are merged and keys can be
# duplicated but the last one in "wins"
[includeIf "gitdir:/home/mcrute/"]
	path = ~/.gitconfig-personal

[includeIf "gitdir:/Users/mcrute/"]
	path = ~/.gitconfig-personal

[includeIf "gitdir:/aports/"]
	path = ~/.gitconfig-personal

[includeIf "gitdir:/mnt/Mike/"]
	path = ~/.gitconfig-personal

[includeIf "gitdir:/usr/local/google/home/mcrute/"]
	path = ~/.gitconfig-google