-
Notifications
You must be signed in to change notification settings - Fork 0
/
base.gitconfig
183 lines (170 loc) · 3.59 KB
/
base.gitconfig
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
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
#!/not/executable
#
# Copyright (c) 2012-2023 Matthew Pearson <[email protected]>.
#
# These scripts are free. There is no warranty; your mileage may vary.
# Visit http://creativecommons.org/licenses/by-nc-sa/4.0/ for more details.
#
# configuration setup for git
#
[alias]
ack = "!f() { \
git grep -E -I --break --heading --show-function \"$*\" -- ':(exclude)*.css.map' ':(exclude)*.min.*' ; \
}; f"
bbdiff = difftool -y -t bbdiff
cancel = reset --soft HEAD^
diffstat = diff -r --no-merges --stat
ksdiff = difftool -y -t ksdiff
last = log -1 -p HEAD
longline = log --abbrev-commit --graph --topo-order --pretty=tformat:'%C(auto)%h %C(dim)%ad%C(reset) %s %C(dim)(%an)%C(reset)'
oneline = log --abbrev-commit --date=short --graph --pretty=oneline
pdiff = whatchanged -n 1 -p
twdiff = difftool -y -t twdiff
unstage = reset HEAD
wdiff = diff --minimal --word-diff=color
whatline = whatchanged --abbrev-commit --date=short --graph --pretty=oneline
[blame]
date = short
[branch]
autosetuprebase = always
[color]
ui = auto
[commit]
gpgsign = true
[core]
autocrlf = input
editor = emacs
pager = cat
safecrlf = false
[diff]
mnemonicprefix = true
tool = "ksdiff"
[difftool]
prompt = false
[difftool "bbdiff"]
cmd = bbdiff --wait --resume "$REMOTE" "$LOCAL"
[difftool "ksdiff"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool "twdiff"]
cmd = twdiff --wait --resume "$REMOTE" "$LOCAL"
[gpg]
format = ssh
[gpg "ssh"]
allowedSignersFile = __G_HOME__/.gitconfig_signers
program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
[grep]
lineNumber = true
[log]
abbrev-commit = true
date = short
decorate = short
[merge]
tool = "ksdiff"
[mergetool]
prompt = false
[mergetool "ksdiff"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
[push]
default = simple
[rebase]
whitespace = fix
[remote]
verbose = true
[tag]
gpgsign = true
[user]
email = __G_USER_EMAIL__
name = __G_USER_TRUENAME__
signingkey = __G_SIGNINGKEY__
#
# Yellow means local
#
# currently-selected branch
[color "branch"]
current = yellow reverse bold
[color "decorate"]
HEAD = yellow reverse bold
[color "status"]
branch = yellow reverse bold
# non-selected local branches
[color "branch"]
local = yellow
[color "decorate"]
branch = yellow
# local, uncommitted edits
[color "status"]
changed = yellow
#
# Cyan means remote
#
# upstream branches
[color "branch"]
upstream = cyan bold
# remote branches
[color "branch"]
remote = cyan
[color "decorate"]
remoteBranch = cyan
# local, staged edits
[color "status"]
added = cyan # synonymous with 'updated'
#
# Dim means metadata
#
[color "diff"]
commit = bold # this is also styles sha's in `git log`
frag = dim
func = dim italic
meta = dim italic
[color "grep"]
filename = bold
function = dim italic
linenumber = dim
separator = dim
[color "interactive"]
header = cyan
#
# Green means newly-added or found
#
[color "diff"]
new = green
[color "grep"]
match = green bold ul
#
# Red means removed
#
[color "diff"]
old = red
#
# Red reverse means error
#
[color "diff"]
whitespace = red reverse
[color "interactive"]
error = red reverse bold
[color "status"]
nobranch = red reverse bold
#
# Magenta means git
#
[color "branch"]
plain = magenta
[color "decorate"]
stash = magenta
tag = magenta
[color "interactive"]
prompt = magenta bold
#
# Unassigned values inherit from the shell and are here for reference
#
[color "diff"]
plain =
[color "grep"]
context = dim
selected =
[color "interactive"]
help = dim
[color "status"]
header =
untracked = dim
#EOF __TAGGED__