... | ... |
@@ -165,3 +165,77 @@ |
165 | 165 |
[absorb] |
166 | 166 |
; https://github.com/tummychow/git-absorb |
167 | 167 |
maxStack = 100 |
168 |
+ |
|
169 |
+[pretty] |
|
170 |
+ patch = format:%C(BrightYellow)commit %h%C(auto)%d%n%C(BrightYellow)Author: %aN <%aE>%n%C(BrightYellow)Date: %ad%n%n%C(Yellow)%s%n |
|
171 |
+ compact = tformat:%C(BrightYellow)%h %C(BrightMagenta)%>(13,trunc)%ar %C(BrightBlue)%<(15,trunc)%aN %C(BrightWhite)%s%C(auto)%d |
|
172 |
+ |
|
173 |
+[alias] |
|
174 |
+ ; Log. |
|
175 |
+ l = log --graph --pretty=compact |
|
176 |
+ ls = log --oneline --decorate=no |
|
177 |
+ lf = log --first-parent |
|
178 |
+ lp = log --patch --pretty=patch |
|
179 |
+ lpw = lp --color-words='[_[:alnum:]]+|[^[:space:]]' |
|
180 |
+ lpww = lp --color-words='.' |
|
181 |
+ la = l --all |
|
182 |
+ lsa = ls --all |
|
183 |
+ lfa = lf --all |
|
184 |
+ lpa = lp --all |
|
185 |
+ lpwa = lpw --all |
|
186 |
+ lpwwa = lpww --all |
|
187 |
+ |
|
188 |
+ ; Status. |
|
189 |
+ s = status |
|
190 |
+ ss = status --short |
|
191 |
+ sb = status --short --branch |
|
192 |
+ sa = s --ignored |
|
193 |
+ ssa = ss --ignored |
|
194 |
+ sba = sb --ignored |
|
195 |
+ |
|
196 |
+ ; Diff. |
|
197 |
+ d = diff |
|
198 |
+ du = diff @{upstream} |
|
199 |
+ dp = diff @{push} |
|
200 |
+ dc = d --cached |
|
201 |
+ duc = du --cached |
|
202 |
+ dpc = dp --cached |
|
203 |
+ dw = d --color-words='[_[:alnum:]]+|[^[:space:]]' |
|
204 |
+ duw = du --color-words='[_[:alnum:]]+|[^[:space:]]' |
|
205 |
+ dpw = dp --color-words='[_[:alnum:]]+|[^[:space:]]' |
|
206 |
+ dcw = dc --color-words='[_[:alnum:]]+|[^[:space:]]' |
|
207 |
+ ducw = duc --color-words='[_[:alnum:]]+|[^[:space:]]' |
|
208 |
+ dpcw = dpc --color-words='[_[:alnum:]]+|[^[:space:]]' |
|
209 |
+ dww = d --color-words='.' |
|
210 |
+ duww = du --color-words='.' |
|
211 |
+ dpww = dp --color-words='.' |
|
212 |
+ dcww = dc --color-words='.' |
|
213 |
+ ducww = duc --color-words='.' |
|
214 |
+ dpcww = dpc --color-words='.' |
|
215 |
+ |
|
216 |
+ ; Add. |
|
217 |
+ au = add -u |
|
218 |
+ aa = add -A |
|
219 |
+ |
|
220 |
+ ; Commit. |
|
221 |
+ c = commit |
|
222 |
+ ca = commit --amend |
|
223 |
+ |
|
224 |
+ ; Rebase. |
|
225 |
+ ri = rebase -i |
|
226 |
+ ro = rebase -i --root |
|
227 |
+ rr = rebase --continue |
|
228 |
+ |
|
229 |
+ ; Fetch. |
|
230 |
+ f = fetch |
|
231 |
+ |
|
232 |
+ ; Push. |
|
233 |
+ p = push |
|
234 |
+ pf = push --force-with-lease |
|
235 |
+ |
|
236 |
+ ; Clean ignored files (requires either `-f`, `-i` or `-n`). |
|
237 |
+ x = clean -Xd |
|
238 |
+ |
|
239 |
+ ; Contains. |
|
240 |
+ contains = tag --contains |
|
241 |
+ ; contains = describe --contains |