-
Notifications
You must be signed in to change notification settings - Fork 2
Expand file tree
/
Copy path.gitconfig
More file actions
245 lines (206 loc) · 6.76 KB
/
.gitconfig
File metadata and controls
245 lines (206 loc) · 6.76 KB
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
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
[user]
name = Andrei Dragomir
email = adragomi@adobe.com
[color]
ui = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = green bold
[color "status"]
added = yellow
changed = green
untracked = cyan
[log]
decorate = full
date = relative
[interactive]
singlekey = true
[alias]
st = status
st2 = "ls-files --exclude-per-directory=.gitignore --exclude-from=.git/info/exclude -t -o -u -s -m -d"
sts = status -sb --ignore-submodules=all -unormal
cleanup = !git remote prune origin && git gc && git clean -df && git stash clear
unreachable = "!git fsck --unreachable | grep commit | cut -d \\ -f3 | xargs git log --merges --no-walk"
cat = -p cat-file -p
ci = commit
root = rev-parse --show-toplevel
id = rev-parse
this = rev-parse --abbrev-ref HEAD
co = checkout
d = diff --ignore-submodules=all # diff unstaged changes
dc = diff --cached --ignore-submodules=all
amend = commit --amend
cu = checkout -p
# Goodness (summary of diff lines added/removed/total)
gn = goodness
gnc = goodness --cached
fa = fetch --all --prune
f = fetch -p --tags
head = !git l -1
b = branch -v
ba = branch -av
h = !git head
hp = "!source ~/bin/githelpers && show_git_head"
l = "!source ~/bin/githelpers && pretty_git_log"
log1 = log --pretty=oneline --abbrev-commit --decorate
llog = log --graph --pretty=format:'%C(yellow)%h%Creset %C(bold blue)%an%Creset -%C(bold cyan)%d%Creset %s %C(green)(%cr)%Creset' --abbrev-commit --date=relative
lg = log --pretty=format:'%C(yellow)%h %C(green)%ar %C(bold blue)%an%Creset\n%s' --abbrev-commit --date=relative
lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
pr = ! export CURRENT=$(git symbolic-ref HEAD | gsed -e "s#refs/heads/##") && echo \"Synchronising with origin/$CURRENT...\" && git fetch origin && git rebase -p origin/$CURRENT
prb = "!rebase() { \
LOCAL_BRANCH=$(git symbolic-ref HEAD | sed -e \"s?.*/\\([^/]*\\)?\\1?\") && \
echo $LOCAL_BRANCH && \
REMOTE_BRANCH=${2:-$(git config branch.${LOCAL_BRANCH}.merge | sed -e \"s?.*/\\([^/]*\\)?\\1?\")} && \
REMOTE_NAME=${1:-$(git config branch.${LOCAL_BRANCH}.remote)} && \
echo \"Synchronising $LOCAL_BRANCH with $REMOTE_NAME/$REMOTE_BRANCH...\" &&\
git stash && \
git fetch $REMOTE_NAME && \
git rebase -p $REMOTE_NAME/$REMOTE_BRANCH && \
git stash pop; };\
rebase"
prbm = "!rebase() { \
LOCAL_BRANCH=$(git symbolic-ref HEAD | sed -e \"s?.*/\\([^/]*\\)?\\1?\") && \
echo $LOCAL_BRANCH && \
REMOTE_BRANCH=master && \
REMOTE_NAME=origin && \
echo \"Synchronising $LOCAL_BRANCH with $REMOTE_NAME/$REMOTE_BRANCH...\" &&\
git stash && \
git fetch $REMOTE_NAME && \
git rebase -p $REMOTE_NAME/$REMOTE_BRANCH && \
git stash pop; };\
rebase"
rbi = ! export LOCAL_BRANCH=$(git symbolic-ref HEAD | sed -e \"s?.*/\\([^/]*\\)?\\1?\") && \
echo $LOCAL_BRANCH && \
export REMOTE_BRANCH=$(git config branch.${LOCAL_BRANCH}.merge | sed -e \"s?.*/\\([^/]*\\)?\\1?\") && \
REMOTE_NAME=$(git config branch.${LOCAL_BRANCH}.remote) && \
git rebase -i $REMOTE_NAME/$REMOTE_BRANCH
rb = "!fn() { git stash && git rebase -i HEAD~$1 && git stash pop; }; fn"
cos = "!fn() { git stash && git co $1 && git stash pop; }; fn"
stash-rename = "!_() { rev=$(git rev-parse $1) && git stash drop $1 || exit 1 ; git diff-index --quiet HEAD; s=$?; [ $s != 0 ] && git stash save "tmp stash from stash-rename"; git stash apply $rev && shift && git stash save "$@" && [ $s != 0 ] && git stash pop stash@{1}; }; _"
[format]
pretty = format:%C(blue)%ad%Creset %C(yellow)%h%C(green)%d%Creset %C(blue)%s %C(magenta) [%an]%Creset
[pull]
rebase = true
[push]
default = simple
[rebase]
stat = true
autostash = true
[diff]
ignoresubmodules = all
mnemonicprefix = true
renameLimit = 4000
tool = bcomp
[mergetool]
prompt = false
keepBackup = false
[help]
autocorrect = 1
[fetch]
prune = true
[merge]
summary = true
tool = bcomp
conflictStyle = "diff3"
[core]
legacyheaders = false
excludesfile = /Users/adr/.gitignore_global
editor = vim --noplugin
quotepath = false
pager = /opt/homebrew/bin/less -+F -+X -R -K
autocrlf = input
filemode = false
fsmonitor = false
[pager]
log = false
[apply]
whitespace = nowarn
[repack]
usedeltabaseoffset = true
[advice]
statusHints = false
skippedCherryPicks = false
detachedHead = false
[gui]
fontdiff = -family Inconsolata-g -size 13 -weight normal -slant roman -underline 0 -overstrike 0
editor = nvim
fontui = -family \"Noto Sans\" -size 12 -weight normal -slant roman -underline 0 -overstrike 0
tabsize = 2
; [github]
; user = adragomir
; password = ! /usr/bin/security 2>&1 >/dev/null find-generic-password -gs github | ruby -e 'print $1 if STDIN.gets =~ /^password: \\\"(.*)\\\"$/'
[hub]
host = git.corp.adobe.com
protocol = https
[branch]
autosetupmerge = false
autosetuprebase = always
[status]
relativePaths = false
showUntrackedFiles = all
[rerere]
enabled = true
[giggle]
main-window-maximized = true
main-window-geometry = 274x34+1164+486
history-view-vpane-position = 300
main-window-view = FileView
file-view-vpane-position = 443
; [url "https://github.com"]
; insteadOf = git://github.com
[url "git@git.corp.adobe.com:"]
insteadOf = https://git.corp.adobe.com/
[url "github-adobe:AdobeAnalytics"]
insteadOf = git@github.com:AdobeAnalytics
[url "github-adobe:OneAdobe"]
insteadOf = git@github.com:OneAdobe
[grep]
fullname = true
extendRegexp = true
lineNumber = true
[filter "media"]
required = true
clean = git media clean %f
smudge = git media smudge %f
[mergetool "bcomp"]
trustExitCode = true
cmd = "/usr/local/bin/bcomp" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
[merge "mergiraf"]
name = mergiraf
driver = mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L
[cola]
spellcheck = false
textwidth = 88
tabwidth = 4
fontdiff = Monaco,11,-1,5,50,0,0,0,0,0
fontsize = 11
theme = macos-aqua-light
icontheme = light
[webui]
autoupdate = true
[credential]
helper = manager
gitHubAccountFiltering = false
helper =
helper = /usr/local/share/gcm-core/git-credential-manager
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[http]
cookiefile = /Users/adragomi/.gitcookies
[credential "https://git.casuallyblue.dev"]
provider = generic
[credential "https://codeberg.org"]
provider = generic
[credential "https://git.rfleury.com"]
provider = generic
[credential "https://dev.azure.com"]
useHttpPath = true