-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy path.gitconfig
191 lines (191 loc) · 6.55 KB
/
.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
184
185
186
187
188
189
190
191
[user]
name = Daniel Fanjul
email = [email protected]
[core]
attributesfile = ~/.gitattributesfile
excludesfile = ~/.gitexcludesfile
[advice]
pushUpdateRejected = false
statusHints = false
statusUoption = false
commitBeforeMerge = false
resolveConflict = false
implicitIdentity = false
detachedHead = false
rmHints = false
[help]
autocorrect = 12
[color]
ui = auto
[alias]
a = add
aa = add --update
aadd = annex add
acopy = annex copy
addxid = commit --amend -C HEAD
adrop = annex drop
adropf = annex drop --force
aedit = annex edit
afind = annex find
afix = annex fix
afsck = !"git async; git annex fsck --fast --quiet"
aget = annex get
alock = annex lock
alog = annex log
amove = annex move
ap = add -p
assume-unchanged = update-index --assume-unchanged
astatus = annex status
async = annex sync --quiet
aunused = !"git async; git annex unused --quiet && git annex dropunused 1-99999"
awhereis = annex whereis
b = branch
bm = !"i=`whoami` && { git show-ref | egrep \" refs/heads/(feature/)?$i\"; for r in `git remote`; do echo $r: && git ls-remote $r | egrep \"\trefs/heads/(feature/)?$i\"; done; }"
bt = !~/usr/local/bin/git-greb -t
bump = !"submodule=\"${1%/}\" && shift && { branch=\"$1\" && shift || branch=$(git symbolic-ref-head); } && ( cd \"$submodule\" && git fetch origin \"$branch\" && git checkout FETCH_HEAD ) && git commit -e -m \"Bump $submodule submodule to $branch\" \"$submodule\""
bx = !~/usr/local/bin/git-greb -x
c = checkout
c- = checkout @{-1}
ca = commit -v -a
caa = !git commit -v -a -m $(git symbolic-ref --short HEAD 2>/dev/null || echo HEAD)
cempty = !"git checkout $(git commit-tree $(git mktree </dev/null) </dev/null)"
ci = commit -v
cii = !git commit -v -m $(git symbolic-ref --short HEAD 2>/dev/null || echo HEAD)
cp = checkout -p
cu = checkout @{u}
cup = checkout @{u} -p
d = diff
ds = diff --stat
du = diff @{u}
dus = diff --stat @{u}
empty = commit --allow-empty -m empty
f = fetch
fa = fetch --all
fag = !"gpg-connect-agent updatestartuptty /bye && git fetch --all"
ff = merge --ff-only
fhardu = !git f && git hardu
fixup = !f=\"$1\" && shift && git ci --fixup=\"$f\"
flow = !git-flow
freu = !git f && git reu
freus = !git f && git reus
fsb = !"git fa; git sb"
fsbm = !git fa && git sbm
fsbs = !git fa && git sbs
fsbu = !git f && git sbu
fsr = !"git fa; git sr"
g- = !"if b=$(git symbolic-ref --short GREB_HEAD); then ~/usr/local/bin/git-greb -C \"$b\"; else ~/usr/local/bin/git-greb; fi"
g-l = !"if b=$(git symbolic-ref --short GREB_HEAD); then ~/usr/local/bin/git-greb -C \"$b\" -l; else ~/usr/local/bin/git-greb -l; fi"
ga = !~/usr/local/bin/git-greb -C a
gad = !~/usr/local/bin/git-greb -C a -d
gal = !~/usr/local/bin/git-greb -C a -l
gald = !~/usr/local/bin/git-greb -C a -l -d
gerrit = review
gerrit-hook = !"scp git.spotify.net:hooks/commit-msg $(git rev-parse --git-dir)/hooks/"
gerrit-hook-submodules = !"git submodule foreach --recursive 'scp git.spotify.net:hooks/commit-msg $(git rev-parse --git-dir)/hooks/'"
gl = !~/usr/local/bin/git-greb -C l
gld = !~/usr/local/bin/git-greb -C l -d
gll = !~/usr/local/bin/git-greb -C l -l
glld = !~/usr/local/bin/git-greb -C l -l -d
gn = !~/usr/local/bin/git-greb -C n
gnd = !~/usr/local/bin/git-greb -C n -d
gnl = !~/usr/local/bin/git-greb -C n -l
gnld = !~/usr/local/bin/git-greb -C n -l -d
greb = !~/usr/local/bin/git-greb
grebl = !~/usr/local/bin/git-greb -l
gsd = !~/usr/local/bin/git-greb -s -d
hard = reset --hard
hardu = reset --hard @{u}
history-reset = !git reset `echo Initial commit | git commit-tree HEAD:`
k = cherry-pick
ke = cherry-pick --edit
kf = cherry-pick --ff
lg = log --decorate --graph --oneline
lga = log --decorate --graph --oneline --all
lgb = log --decorate --graph --oneline --branches
lgf = log --decorate --graph --show-signature --abbrev-commit --format=fuller
lgr = log --decorate --graph --show-signature --abbrev-commit --format=raw
n = commit -v --amend
nn = commit -v --amend --reset-author
no-assume-unchanged = update-index --no-assume-unchanged
objs = count-objects -v
p = diff --cached
pf = pull --no-rebase --ff-only
pm = pull --no-rebase
pr = pull --rebase
ps = diff --cached --stat
pull-from-peer = !bash -c \"b=\\$(git symbolic-ref --short HEAD) && c=\\$(sed s/$(whoami)/$1/ <<< \\$b) && set -x && git pull origin \\$c\"
pushm = !me=$(whoami) && git push -v \"$@\" origin \"refs/heads/$me/*\"
pushs = push -v origin +:
r = remote
re = rebase --interactive
reu = rebase --interactive HEAD@{u}
reus = !git reset --soft $(git commit-tree -p @{u} HEAD: <<< $(git symbolic-ref-head))
rp = reset -p
rsclean = !git clean -fdx && git submodule foreach --recursive git clean -fdx
rshard = !git reset --hard && git submodule foreach --recursive git reset --hard
rsupdate = submodule update --init --recursive
rv = revert
rvne = revert --no-edit
s = status -sb
sb = show-branch
sbc = show-branch --current
sbm = !git show-branch `git symbolic-ref-head -q || echo HEAD` master
sbs = !git show-branch \\*`git symbolic-ref-head -q || echo HEAD`
sbu = !git show-branch `git symbolic-ref-head -q || echo HEAD` `git rev-parse --symbolic-full-name --abbrev-ref HEAD@{u}`
soft = reset --soft
squash = !s=\"$1\" && shift && git ci --squash=\"$s\"
sr = show-ref
symbolic-ref-head = symbolic-ref --short HEAD
ua = !git symbolic-ref -d refs/heads/a";" git branch -D a";" git symbolic-ref refs/heads/a $(git rev-parse --symbolic-full-name @)
uad = !git symbolic-ref -d refs/heads/a";" git branch -D a";" git checkout -b a -t $(git rev-parse --symbolic-full-name @)
un = !git symbolic-ref -d refs/heads/n";" git branch -D n";" git symbolic-ref refs/heads/n $(git rev-parse --symbolic-full-name @)
und = !git symbolic-ref -d refs/heads/n";" git branch -D n";" git checkout -b n -t $(git rev-parse --symbolic-full-name @)
ur = update-ref
[status]
submodulesummary = true
[log]
date = local
[diff]
mnemonicprefix = true
renames = copy
algorithm = patience
[diff "textutil"]
textconv = textutil -convert txt -stdout
[merge]
stat = false
tool = vimdiff
conflictstyle = diff3
defaultToUpstream = true
[mergetool]
keepBackup = false
prompt = false
[rerere]
enabled = true
autoupdate = true
[fetch]
prune = true
[push]
default = upstream
[pull]
rebase = true
[rebase]
stat = false
autosquash = true
[tig]
tab-size = 4
line-graphics = utf-8
[instaweb]
browser = chromium-browser
[gitreview]
rebase = false
[pager]
log = diff-highlight | less
show = diff-highlight | less
diff = diff-highlight | less
[filter "gofmt"]
clean = gofmt
smudge = gofmt
[url "ssh://bitbucket.org/"]
insteadOf = https://bitbucket.org/
[gpg]
program = gpg2