summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Crute <mike@crute.us>2023-01-16 21:20:29 -0800
committerMike Crute <mike@crute.us>2023-01-16 21:20:57 -0800
commit901dfe88f834654ba8da851f119f5dfde5353031 (patch)
tree5e09f68226ea25d88b9ce36d4a192169ba347f07
parentd0dc85708bd7482685250352b39c5ae2174396c8 (diff)
downloaddotfiles-901dfe88f834654ba8da851f119f5dfde5353031.tar.bz2
dotfiles-901dfe88f834654ba8da851f119f5dfde5353031.tar.xz
dotfiles-901dfe88f834654ba8da851f119f5dfde5353031.zip
Consistently use tabs
The git config tooling uses tabs for everything so just use tabs everywhere consistently.
-rw-r--r--.gitconfig198
-rw-r--r--.gitconfig-personal8
2 files changed, 104 insertions, 102 deletions
diff --git a/.gitconfig b/.gitconfig
index 701d3c3..01cd5f4 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,118 +1,120 @@
1# vim:noet:
2
1[user] 3[user]
2 name = Mike Crute 4 name = Mike Crute
3 useConfigOnly = true 5 useConfigOnly = true
4 #signingkey = 6 #signingkey =
5 7
6[github] 8[github]
7 user = mcrute 9 user = mcrute
8 10
9[core] 11[core]
10 whitespace = warn 12 whitespace = warn
11 excludesfile = ~/.git-exclude 13 excludesfile = ~/.git-exclude
12 pager = less -FMRiX 14 pager = less -FMRiX
13 quotepath = false 15 quotepath = false
14 16
15[alias] 17[alias]
16 purge = clean -d -f 18 purge = clean -d -f
17 compact = gc --aggressive --prune 19 compact = gc --aggressive --prune
18 leader = shortlog -sn 20 leader = shortlog -sn
19 21
20 ignore = update-index --assume-unchanged 22 ignore = update-index --assume-unchanged
21 unignore = update-index --no-assume-unchanged 23 unignore = update-index --no-assume-unchanged
22 ignored = !git ls-files -v | grep '^[[:lower:]]' 24 ignored = !git ls-files -v | grep '^[[:lower:]]'
23 25
24 l = log --graph --abbrev-commit --date=relative 26 l = log --graph --abbrev-commit --date=relative
25 27
26 st = status -sb 28 st = status -sb
27 rv = remote -v 29 rv = remote -v
28 30
29 in = !"git l ..$(git rev-parse --abbrev-ref --symbolic-full-name @{upstream})" 31 in = !"git l ..$(git rev-parse --abbrev-ref --symbolic-full-name @{upstream})"
30 out = !"git l $(git rev-parse --abbrev-ref --symbolic-full-name @{upstream}).." 32 out = !"git l $(git rev-parse --abbrev-ref --symbolic-full-name @{upstream}).."
31 33
32 ar = add -A 34 ar = add -A
33 ci = commit 35 ci = commit
34 co = checkout 36 co = checkout
35 rc = rebase --continue 37 rc = rebase --continue
36 ri = rebase -i 38 ri = rebase -i
37 rs = rebase -i --autosquash 39 rs = rebase -i --autosquash
38 dc = diff --cached 40 dc = diff --cached
39 rk = rm --cached 41 rk = rm --cached
40 ra = !git l --all -20 42 ra = !git l --all -20
41 lp = log --format=full -p -1 43 lp = log --format=full -p -1
42 lf = log --format=fuller -p 44 lf = log --format=fuller -p
43 ls = log --stat --format=fuller 45 ls = log --stat --format=fuller
44 sl = !git l -n 10 46 sl = !git l -n 10
45 ca = commit -v --amend 47 ca = commit -v --amend
46 ap = add -p 48 ap = add -p
47 br = branch -a -vv 49 br = branch -a -vv
48 ig = update-index --assume-unchanged 50 ig = update-index --assume-unchanged
49 os = !git out --stat 51 os = !git out --stat
50 of = !git out --format=full 52 of = !git out --format=full
51 wd = diff --word-diff=color 53 wd = diff --word-diff=color
52 54
53 wdc = diff --cached --word-diff=color 55 wdc = diff --cached --word-diff=color
54 uig = update-index --no-assume-unchanged 56 uig = update-index --no-assume-unchanged
55 arp = add -A -p 57 arp = add -A -p
56 sup = submodule update --remote --merge 58 sup = submodule update --remote --merge
57 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 59 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
58 60
59 spush = push --recurse-submodules=on-demand 61 spush = push --recurse-submodules=on-demand
60 made = log --reverse --format='format:%C(blue)%an%C(reset) <%ae> %C(green)(%ar)%C(reset)' 62 made = log --reverse --format='format:%C(blue)%an%C(reset) <%ae> %C(green)(%ar)%C(reset)'
61 taglist = show-ref --tags -d 63 taglist = show-ref --tags -d
62 whoami = !git config -l | awk -F= '/^user.email/ { print $2 }' 64 whoami = !git config -l | awk -F= '/^user.email/ { print $2 }'
63 65
64 sync-subs = submodule update --init --checkout --recursive --force 66 sync-subs = submodule update --init --checkout --recursive --force
65 is-reviewed = !"GIT_EDITOR='git interpret-trailers --trailer \"Reviewed-by: $(git config user.name) <$(git config user.email)>\" --in-place' git commit --amend" 67 is-reviewed = !"GIT_EDITOR='git interpret-trailers --trailer \"Reviewed-by: $(git config user.name) <$(git config user.email)>\" --in-place' git commit --amend"
66 68
67[color] 69[color]
68 ui = auto 70 ui = auto
69 71
70[svn] 72[svn]
71 rmdir = true 73 rmdir = true
72 74
73[format] 75[format]
74 pretty = format:%C(yellow)%h%Creset -%C(red)%d%Creset %<(60,trunc)%s %Cgreen(%ar) %C(bold blue)<%an>%Creset 76 pretty = format:%C(yellow)%h%Creset -%C(red)%d%Creset %<(60,trunc)%s %Cgreen(%ar) %C(bold blue)<%an>%Creset
75 77
76[merge] 78[merge]
77 tool = vimdiff 79 tool = vimdiff
78 ff = only 80 ff = only
79 81
80[rerere] 82[rerere]
81 enabled = true 83 enabled = true
82 84
83[pull] 85[pull]
84 rebase = true 86 rebase = true
85 87
86[push] 88[push]
87 default = current 89 default = current
88 90
89[branch] 91[branch]
90 autosetuprebase = always 92 autosetuprebase = always
91 93
92[status] 94[status]
93 submoduleSummary = true 95 submoduleSummary = true
94 96
95[transfer] 97[transfer]
96 fsckobjects = true 98 fsckobjects = true
97 99
98[fetch] 100[fetch]
99 fsckobjects = true 101 fsckobjects = true
100 102
101[receive] 103[receive]
102 fsckObjects = true 104 fsckObjects = true
103 105
104[trailer] 106[trailer]
105 ifexists = addIfDifferent 107 ifexists = addIfDifferent
106 108
107[clean] 109[clean]
108 requireForce = false 110 requireForce = false
109 111
110[commit] 112[commit]
111 verbose = true 113 verbose = true
112# gpgsign = true 114 #gpgsign = true
113# 115
114#[tag] 116#[tag]
115# gpgsign = true 117# gpgsign = true
116 118
117[http] 119[http]
118 cookiefile = /home/mcrute/.gitcookies 120 cookiefile = /home/mcrute/.gitcookies
@@ -125,49 +127,49 @@
125# Force the system-wide credential helper to nothing, otherwise on Mac OS the 127# Force the system-wide credential helper to nothing, otherwise on Mac OS the
126# Apple provided one that uses keychain overrides the repository-local ones. 128# Apple provided one that uses keychain overrides the repository-local ones.
127[credential] 129[credential]
128 helper = 130 helper =
129 131
130[git-pair] 132[git-pair]
131 authors = Mike Crute <mike.crute@leandog.com> 133 authors = Mike Crute <mike.crute@leandog.com>
132 authors = Joe Fiorini <joe.fiorini@leandog.com> 134 authors = Joe Fiorini <joe.fiorini@leandog.com>
133 authors = Veezus Kreist <veezus.kreist@leandog.com> 135 authors = Veezus Kreist <veezus.kreist@leandog.com>
134 authors = Max Cantor <max@maxcantor.net> 136 authors = Max Cantor <max@maxcantor.net>
135 authors = Chris Weisel <chris.weisel@gmail.com> 137 authors = Chris Weisel <chris.weisel@gmail.com>
136 authors = Zee Spencer <zee@zacharyspencer.com> 138 authors = Zee Spencer <zee@zacharyspencer.com>
137 authors = Eric Hankinson <eric.hankinson@gmail.com> 139 authors = Eric Hankinson <eric.hankinson@gmail.com>
138 authors = Isaac Sanders <isaac.sanders@leandog.com> 140 authors = Isaac Sanders <isaac.sanders@leandog.com>
139 authors = Matt Odonnell <odonnell004@gmail.com> 141 authors = Matt Odonnell <odonnell004@gmail.com>
140 authors = Len Thomas <1970inazuma@gmail.com> 142 authors = Len Thomas <1970inazuma@gmail.com>
141 authors = Michael Lemley <michael.lemley@leandog.com> 143 authors = Michael Lemley <michael.lemley@leandog.com>
142 authors = Huey Peterson <eyston@gmail.com> 144 authors = Huey Peterson <eyston@gmail.com>
143 145
144# Context-specific Config Overrides 146# Context-specific Config Overrides
145# 147#
146# These have to come last. Config sections are merged and keys can be 148# These have to come last. Config sections are merged and keys can be
147# duplicated but the last one in "wins" 149# duplicated but the last one in "wins"
148[includeIf "gitdir:/local/home/crutem/"] 150[includeIf "gitdir:/local/home/crutem/"]
149 path = ~/amazon-bin/.gitconfig 151 path = ~/amazon-bin/.gitconfig
150 152
151[includeIf "gitdir:/home/local/ANT/crutem/"] 153[includeIf "gitdir:/home/local/ANT/crutem/"]
152 path = ~/amazon-bin/.gitconfig 154 path = ~/amazon-bin/.gitconfig
153 155
154[includeIf "gitdir:/home/ANT.AMAZON.COM/crutem/"] 156[includeIf "gitdir:/home/ANT.AMAZON.COM/crutem/"]
155 path = ~/amazon-bin/.gitconfig 157 path = ~/amazon-bin/.gitconfig
156 158
157[includeIf "gitdir:/home/crutem/"] 159[includeIf "gitdir:/home/crutem/"]
158 path = ~/amazon-bin/.gitconfig 160 path = ~/amazon-bin/.gitconfig
159 161
160[includeIf "gitdir:/Users/crutem/"] 162[includeIf "gitdir:/Users/crutem/"]
161 path = ~/amazon-bin/.gitconfig 163 path = ~/amazon-bin/.gitconfig
162 164
163[includeIf "gitdir:/home/mcrute/"] 165[includeIf "gitdir:/home/mcrute/"]
164 path = ~/.gitconfig-personal 166 path = ~/.gitconfig-personal
165 167
166[includeIf "gitdir:/Users/mcrute/"] 168[includeIf "gitdir:/Users/mcrute/"]
167 path = ~/.gitconfig-personal 169 path = ~/.gitconfig-personal
168 170
169[includeIf "gitdir:/aports/"] 171[includeIf "gitdir:/aports/"]
170 path = ~/.gitconfig-personal 172 path = ~/.gitconfig-personal
171 173
172[includeIf "gitdir:/usr/local/google/home/mcrute/"] 174[includeIf "gitdir:/usr/local/google/home/mcrute/"]
173 path = ~/.gitconfig-google 175 path = ~/.gitconfig-google
diff --git a/.gitconfig-personal b/.gitconfig-personal
index 26fe7af..456afe4 100644
--- a/.gitconfig-personal
+++ b/.gitconfig-personal
@@ -1,13 +1,13 @@
1# vim:ft=gitconfig 1# vim:ft=gitconfig noet
2 2
3[user] 3[user]
4 email = mike@crute.us 4 email = mike@crute.us
5 5
6[git-pair] 6[git-pair]
7 email = mcrute@gmail.com 7 email = mcrute@gmail.com
8 8
9[sendemail] 9[sendemail]
10 smtpuser = mike@crute.us 10 smtpuser = mike@crute.us
11 11
12[include] 12[include]
13 path = ~/.git-secrets 13 path = ~/.git-secrets