Skip to content

Commit e57e97f

Browse files
ddelangeddelange
committed
✨ Add git aliases 'squashlast' and 'alias'
1 parent 3c04305 commit e57e97f

File tree

3 files changed

+118
-66
lines changed

3 files changed

+118
-66
lines changed

‎.bash_profile‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
export PATH="/usr/local/sbin:/usr/local/bin:$PATH"
22
export PATH="/usr/local/opt/ruby/bin:/usr/local/lib/ruby/gems/2.7.0/bin:$PATH" # homebrew ruby first in PATH
33
export PATH="${HOME}/.cargo/bin:$PATH" # rust binary installation path
4+
export PATH="/Library/TeX/texbin:$PATH" # mactex binary installation path (brew cask install mactex)
45

56
# bash completion and integration
67

@@ -41,17 +42,19 @@ function cd {
4142
fi
4243
}
4344

44-
alias back="cd -"
45-
alias ls="exa --all --group-directories-first --icons --level=2" # default level for --tree
46-
alias ll="ls --long --sort=age --git --time=modified --time-style=iso"
47-
alias h="history | tail -n 25"
48-
alias cls="printf \"\033c\""
49-
alias dff="icdiff --highlight --line-numbers --numlines=3"
50-
alias gcc="gcc-8"
51-
alias moji="git status && git add . && pre-commit && gitmoji -c"
52-
alias git-summary=/Users/david.de-lange/git/git-summary/git-summary
45+
alias back='cd -'
46+
alias ls='exa --all --group-directories-first --icons --level=2' # default level for --tree
47+
alias ll='ls --long --sort=age --git --time=modified --time-style=iso'
48+
alias h='history | tail -n 25'
49+
alias cls='printf "\033c"'
50+
alias dff='icdiff --highlight --line-numbers --numlines=3'
51+
alias gcc='gcc-8'
52+
alias moji='git status && git add . && pre-commit && gitmoji -c'
53+
alias git-summary='~/git/git-summary/git-summary'
5354
alias s='subl'
5455
alias sm='smerge'
56+
alias xdg-open='open'
57+
5558

5659

5760
# bash_history

‎README.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,11 +314,13 @@ git config --global alias.lg "log --graph --decorate --pretty=oneline --abbrev-c
314314
git config --global alias.fp "fetch -p --all" # purge and fetch all remotes
315315
git config --global alias.defaultbranch '! f() { echo $(git remote show origin | grep "HEAD branch" | cut -d ":" -f 2 | xargs); }; f' # https://stackoverflow.com/questions/28666357#comment101797372_50056710
316316
git config --global alias.df '! f() { git icdiff --color=always "$@" | less -eR; }; f' # no FX (keep output in terminal)
317-
git config --global alias.pr '! git push --set-upstream origin "$(git rev-parse --abbrev-ref HEAD)"'
317+
git config --global alias.pr '! git push --set-upstream origin "$(git rev-parse --abbrev-ref HEAD)"' # push a new branch. will be overwritten if git-extras is installed
318318
git config --global alias.dm '! git fetch -p && for branch in `git branch -vv | grep '"': gone] ' | awk '"'{print $1}'"'"'`; do git branch -D $branch; done' # 'delete merged' - local branches that have been deleted on remote
319319
git config --global alias.gg '! f() { git checkout "${1:-$(git defaultbranch)}" && git dm && git pull; }; f' # git gg develop -- no arg: defaultbranch. Return to default branch (or specified branch), delete merged, pull branch
320320
git config --global alias.pall '! f() { START=$(git branch | grep "\*" | sed "s/^.//"); for i in $(git branch | sed "s/^.//"); do git checkout $i; git pull || break; done; git checkout $START; }; f' # 'pull all' - pull local branches that have been updated on remote
321321
git config --global alias.undo '! f() { git reset --hard $(git rev-parse --abbrev-ref HEAD)@{${1-1}}; }; f' # https://megakemp.com/2016/08/25/git-undo/
322+
git config --global alias.squashlast '"!f(){ git reset --soft HEAD~${1} && git commit --edit -m\"$(git log --format=%B --reverse HEAD..HEAD@{1})\"; };f"' # Squash the last x commits; will prompt you with auto-squashed commit messages
323+
git config --global alias.alias "! git config --get-regexp '^alias\.' | sed -e s/^alias\.// | grep -v ^'alias ' | sed 's/ /#/' | column -ts#"
322324
```
323325

324326

‎com.googlecode.iterm2.plist‎

Lines changed: 103 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ Maximize Active Pane</string>
205205
<key>NSWindow Frame SharedPreferences</key>
206206
<string>243 306 937 514 0 0 1440 877 </string>
207207
<key>NSWindow Frame iTerm Window 0</key>
208-
<string>0 0 1440 877 0 0 1440 877 </string>
208+
<string>0 23 1440 854 0 0 1440 877 </string>
209209
<key>NSWindow Frame iTerm Window 1</key>
210210
<string>0 0 1440 877 0 0 1440 877 </string>
211211
<key>New Bookmarks</key>
@@ -218,34 +218,34 @@ Maximize Active Pane</string>
218218
<key>Ansi 0 Color</key>
219219
<dict>
220220
<key>Blue Component</key>
221-
<real>0.0</real>
221+
<real>0.30978869999999997</real>
222222
<key>Green Component</key>
223-
<real>0.0</real>
223+
<real>0.30978869999999997</real>
224224
<key>Red Component</key>
225-
<real>0.0</real>
225+
<real>0.30978869999999997</real>
226226
</dict>
227227
<key>Ansi 1 Color</key>
228228
<dict>
229229
<key>Blue Component</key>
230-
<real>0.0</real>
230+
<real>0.37647059999999999</real>
231231
<key>Green Component</key>
232-
<real>0.0</real>
232+
<real>0.4235294</real>
233233
<key>Red Component</key>
234-
<real>0.73333334922790527</real>
234+
<real>1</real>
235235
</dict>
236236
<key>Ansi 10 Color</key>
237237
<dict>
238238
<key>Blue Component</key>
239-
<real>0.3333333432674408</real>
239+
<real>0.67277030000000004</real>
240240
<key>Green Component</key>
241241
<real>1</real>
242242
<key>Red Component</key>
243-
<real>0.3333333432674408</real>
243+
<real>0.80941479999999999</real>
244244
</dict>
245245
<key>Ansi 11 Color</key>
246246
<dict>
247247
<key>Blue Component</key>
248-
<real>0.3333333432674408</real>
248+
<real>0.7996491</real>
249249
<key>Green Component</key>
250250
<real>1</real>
251251
<key>Red Component</key>
@@ -254,29 +254,29 @@ Maximize Active Pane</string>
254254
<key>Ansi 12 Color</key>
255255
<dict>
256256
<key>Blue Component</key>
257-
<real>1</real>
257+
<real>0.9982605</real>
258258
<key>Green Component</key>
259-
<real>0.3333333432674408</real>
259+
<real>0.86277559999999998</real>
260260
<key>Red Component</key>
261-
<real>0.3333333432674408</real>
261+
<real>0.71165029999999996</real>
262262
</dict>
263263
<key>Ansi 13 Color</key>
264264
<dict>
265265
<key>Blue Component</key>
266-
<real>1</real>
266+
<real>0.99652090000000004</real>
267267
<key>Green Component</key>
268-
<real>0.3333333432674408</real>
268+
<real>0.61330589999999996</real>
269269
<key>Red Component</key>
270270
<real>1</real>
271271
</dict>
272272
<key>Ansi 14 Color</key>
273273
<dict>
274274
<key>Blue Component</key>
275-
<real>1</real>
275+
<real>0.99703969999999997</real>
276276
<key>Green Component</key>
277-
<real>1</real>
277+
<real>0.87631029999999999</real>
278278
<key>Red Component</key>
279-
<real>0.3333333432674408</real>
279+
<real>0.87591359999999996</real>
280280
</dict>
281281
<key>Ansi 15 Color</key>
282282
<dict>
@@ -290,72 +290,72 @@ Maximize Active Pane</string>
290290
<key>Ansi 2 Color</key>
291291
<dict>
292292
<key>Blue Component</key>
293-
<real>0.0</real>
293+
<real>0.37647059999999999</real>
294294
<key>Green Component</key>
295-
<real>0.73333334922790527</real>
295+
<real>1</real>
296296
<key>Red Component</key>
297-
<real>0.0</real>
297+
<real>0.65882350000000001</real>
298298
</dict>
299299
<key>Ansi 3 Color</key>
300300
<dict>
301301
<key>Blue Component</key>
302-
<real>0.0</real>
302+
<real>0.71372550000000001</real>
303303
<key>Green Component</key>
304-
<real>0.73333334922790527</real>
304+
<real>1</real>
305305
<key>Red Component</key>
306-
<real>0.73333334922790527</real>
306+
<real>1</real>
307307
</dict>
308308
<key>Ansi 4 Color</key>
309309
<dict>
310310
<key>Blue Component</key>
311-
<real>0.73333334922790527</real>
311+
<real>0.99607840000000003</real>
312312
<key>Green Component</key>
313-
<real>0.0</real>
313+
<real>0.79607839999999996</real>
314314
<key>Red Component</key>
315-
<real>0.0</real>
315+
<real>0.58823530000000002</real>
316316
</dict>
317317
<key>Ansi 5 Color</key>
318318
<dict>
319319
<key>Blue Component</key>
320-
<real>0.73333334922790527</real>
320+
<real>0.99215690000000001</real>
321321
<key>Green Component</key>
322-
<real>0.0</real>
322+
<real>0.4509804</real>
323323
<key>Red Component</key>
324-
<real>0.73333334922790527</real>
324+
<real>1</real>
325325
</dict>
326326
<key>Ansi 6 Color</key>
327327
<dict>
328328
<key>Blue Component</key>
329-
<real>0.73333334922790527</real>
329+
<real>0.99607840000000003</real>
330330
<key>Green Component</key>
331-
<real>0.73333334922790527</real>
331+
<real>0.77254900000000004</real>
332332
<key>Red Component</key>
333-
<real>0.0</real>
333+
<real>0.77647060000000001</real>
334334
</dict>
335335
<key>Ansi 7 Color</key>
336336
<dict>
337337
<key>Blue Component</key>
338-
<real>0.73333334922790527</real>
338+
<real>0.93353169999999996</real>
339339
<key>Green Component</key>
340-
<real>0.73333334922790527</real>
340+
<real>0.93353169999999996</real>
341341
<key>Red Component</key>
342-
<real>0.73333334922790527</real>
342+
<real>0.93353169999999996</real>
343343
</dict>
344344
<key>Ansi 8 Color</key>
345345
<dict>
346346
<key>Blue Component</key>
347-
<real>0.3333333432674408</real>
347+
<real>0.4862745</real>
348348
<key>Green Component</key>
349-
<real>0.3333333432674408</real>
349+
<real>0.4862745</real>
350350
<key>Red Component</key>
351-
<real>0.3333333432674408</real>
351+
<real>0.4862745</real>
352352
</dict>
353353
<key>Ansi 9 Color</key>
354354
<dict>
355355
<key>Blue Component</key>
356-
<real>0.3333333432674408</real>
356+
<real>0.69019609999999998</real>
357357
<key>Green Component</key>
358-
<real>0.3333333432674408</real>
358+
<real>0.71372550000000001</real>
359359
<key>Red Component</key>
360360
<real>1</real>
361361
</dict>
@@ -372,6 +372,19 @@ Maximize Active Pane</string>
372372
</dict>
373373
<key>Background Image Location</key>
374374
<string></string>
375+
<key>Badge Color</key>
376+
<dict>
377+
<key>Alpha Component</key>
378+
<real>0.5</real>
379+
<key>Blue Component</key>
380+
<real>0.0</real>
381+
<key>Color Space</key>
382+
<string>sRGB</string>
383+
<key>Green Component</key>
384+
<real>0.1491314172744751</real>
385+
<key>Red Component</key>
386+
<real>1</real>
387+
</dict>
375388
<key>Blinking Cursor</key>
376389
<false/>
377390
<key>Blur</key>
@@ -396,11 +409,24 @@ Maximize Active Pane</string>
396409
<key>Cursor Color</key>
397410
<dict>
398411
<key>Blue Component</key>
399-
<real>0.73333334922790527</real>
412+
<real>0.37647059999999999</real>
400413
<key>Green Component</key>
401-
<real>0.73333334922790527</real>
414+
<real>0.64705880000000005</real>
402415
<key>Red Component</key>
403-
<real>0.73333334922790527</real>
416+
<real>1</real>
417+
</dict>
418+
<key>Cursor Guide Color</key>
419+
<dict>
420+
<key>Alpha Component</key>
421+
<real>0.25</real>
422+
<key>Blue Component</key>
423+
<real>1</real>
424+
<key>Color Space</key>
425+
<string>sRGB</string>
426+
<key>Green Component</key>
427+
<real>0.9268307089805603</real>
428+
<key>Red Component</key>
429+
<real>0.70213186740875244</real>
404430
</dict>
405431
<key>Cursor Text Color</key>
406432
<dict>
@@ -730,6 +756,19 @@ Maximize Active Pane</string>
730756
<string>[1;5F</string>
731757
</dict>
732758
</dict>
759+
<key>Link Color</key>
760+
<dict>
761+
<key>Alpha Component</key>
762+
<real>1</real>
763+
<key>Blue Component</key>
764+
<real>0.73423302173614502</real>
765+
<key>Color Space</key>
766+
<string>sRGB</string>
767+
<key>Green Component</key>
768+
<real>0.35916060209274292</real>
769+
<key>Red Component</key>
770+
<real>0.0</real>
771+
</dict>
733772
<key>Mouse Reporting</key>
734773
<true/>
735774
<key>Name</key>
@@ -755,20 +794,20 @@ Maximize Active Pane</string>
755794
<key>Selected Text Color</key>
756795
<dict>
757796
<key>Blue Component</key>
758-
<real>0.0</real>
797+
<real>0.94760049999999996</real>
759798
<key>Green Component</key>
760-
<real>0.0</real>
799+
<real>0.94760049999999996</real>
761800
<key>Red Component</key>
762-
<real>0.0</real>
801+
<real>0.94760049999999996</real>
763802
</dict>
764803
<key>Selection Color</key>
765804
<dict>
766805
<key>Blue Component</key>
767-
<real>1</real>
806+
<real>0.51530609999999999</real>
768807
<key>Green Component</key>
769-
<real>0.8353000283241272</real>
808+
<real>0.22248570000000001</real>
770809
<key>Red Component</key>
771-
<real>0.70980000495910645</real>
810+
<real>0.20990739999999999</real>
772811
</dict>
773812
<key>Send Code When Idle</key>
774813
<false/>
@@ -807,10 +846,11 @@ Maximize Active Pane</string>
807846
<key>NoSyncAllAppVersions</key>
808847
<array>
809848
<string>3.3.9</string>
849+
<string>3.3.6</string>
810850
<string>3.2.8</string>
811851
<string>3.3.0</string>
812852
<string>3.3.7</string>
813-
<string>3.3.6</string>
853+
<string>3.3.12</string>
814854
</array>
815855
<key>NoSyncBFPRecents</key>
816856
<array>
@@ -821,6 +861,13 @@ Maximize Active Pane</string>
821861
</array>
822862
<key>NoSyncCommandHistoryHasEverBeenUsed</key>
823863
<true/>
864+
<key>NoSyncFrame_SessionsPreferences</key>
865+
<dict>
866+
<key>screenFrame</key>
867+
<string>{{0, 0}, {1440, 900}}</string>
868+
<key>topLeft</key>
869+
<string>{417, 794}</string>
870+
</dict>
824871
<key>NoSyncFrame_SharedPreferences</key>
825872
<dict>
826873
<key>screenFrame</key>
@@ -837,7 +884,7 @@ Maximize Active Pane</string>
837884
<key>NoSyncLastTipTime</key>
838885
<real>593204423.13678098</real>
839886
<key>NoSyncLaunchExperienceControllerRunCount</key>
840-
<integer>62</integer>
887+
<integer>93</integer>
841888
<key>NoSyncNeverRemindPrefsChangesLostForFile</key>
842889
<true/>
843890
<key>NoSyncNeverRemindPrefsChangesLostForFile_selection</key>
@@ -1645,6 +1692,8 @@ Maximize Active Pane</string>
16451692
<true/>
16461693
<key>OpenNoWindowsAtStartup</key>
16471694
<false/>
1695+
<key>OpenTmuxWindowsIn</key>
1696+
<integer>0</integer>
16481697
<key>PMPrintingExpandedStateForPrint2</key>
16491698
<false/>
16501699
<key>PasteSpecialChunkDelay</key>
@@ -1705,11 +1754,9 @@ Maximize Active Pane</string>
17051754
<key>SUHasLaunchedBefore</key>
17061755
<true/>
17071756
<key>SULastCheckTime</key>
1708-
<date>2020-05-11T09:25:07Z</date>
1757+
<date>2020-10-30T10:17:39Z</date>
17091758
<key>SUSendProfileInfo</key>
17101759
<false/>
1711-
<key>SUSkippedVersion</key>
1712-
<string>3.3.9</string>
17131760
<key>SUUpdateRelaunchingMarker</key>
17141761
<false/>
17151762
<key>ShowBookmarkName</key>
@@ -7369,6 +7416,6 @@ Maximize Active Pane</string>
73697416
<key>findMode_iTerm</key>
73707417
<integer>0</integer>
73717418
<key>iTerm Version</key>
7372-
<string>3.3.9</string>
7419+
<string>3.3.12</string>
73737420
</dict>
73747421
</plist>

0 commit comments

Comments
 (0)