From e57e97f55cba7c11840bfa780f74f64ea7bd6650 Mon Sep 17 00:00:00 2001
From: ddelange <14880945+ddelange@users.noreply.github.com>
Date: Tue, 24 Nov 2020 17:23:08 +0100
Subject: [PATCH] :sparkles: Add git aliases 'squashlast' and 'alias'
---
.bash_profile | 21 +++--
README.md | 4 +-
com.googlecode.iterm2.plist | 159 +++++++++++++++++++++++-------------
3 files changed, 118 insertions(+), 66 deletions(-)
diff --git a/.bash_profile b/.bash_profile
index c3740c0..c6816fa 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -1,6 +1,7 @@
export PATH="/usr/local/sbin:/usr/local/bin:$PATH"
export PATH="/usr/local/opt/ruby/bin:/usr/local/lib/ruby/gems/2.7.0/bin:$PATH" # homebrew ruby first in PATH
export PATH="${HOME}/.cargo/bin:$PATH" # rust binary installation path
+export PATH="/Library/TeX/texbin:$PATH" # mactex binary installation path (brew cask install mactex)
# bash completion and integration
@@ -41,17 +42,19 @@ function cd {
fi
}
-alias back="cd -"
-alias ls="exa --all --group-directories-first --icons --level=2" # default level for --tree
-alias ll="ls --long --sort=age --git --time=modified --time-style=iso"
-alias h="history | tail -n 25"
-alias cls="printf \"\033c\""
-alias dff="icdiff --highlight --line-numbers --numlines=3"
-alias gcc="gcc-8"
-alias moji="git status && git add . && pre-commit && gitmoji -c"
-alias git-summary=/Users/david.de-lange/git/git-summary/git-summary
+alias back='cd -'
+alias ls='exa --all --group-directories-first --icons --level=2' # default level for --tree
+alias ll='ls --long --sort=age --git --time=modified --time-style=iso'
+alias h='history | tail -n 25'
+alias cls='printf "\033c"'
+alias dff='icdiff --highlight --line-numbers --numlines=3'
+alias gcc='gcc-8'
+alias moji='git status && git add . && pre-commit && gitmoji -c'
+alias git-summary='~/git/git-summary/git-summary'
alias s='subl'
alias sm='smerge'
+alias xdg-open='open'
+
# bash_history
diff --git a/README.md b/README.md
index 216860a..e41373e 100644
--- a/README.md
+++ b/README.md
@@ -314,11 +314,13 @@ git config --global alias.lg "log --graph --decorate --pretty=oneline --abbrev-c
git config --global alias.fp "fetch -p --all" # purge and fetch all remotes
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
git config --global alias.df '! f() { git icdiff --color=always "$@" | less -eR; }; f' # no FX (keep output in terminal)
-git config --global alias.pr '! git push --set-upstream origin "$(git rev-parse --abbrev-ref HEAD)"'
+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
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
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
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
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/
+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
+git config --global alias.alias "! git config --get-regexp '^alias\.' | sed -e s/^alias\.// | grep -v ^'alias ' | sed 's/ /#/' | column -ts#"
```
diff --git a/com.googlecode.iterm2.plist b/com.googlecode.iterm2.plist
index af319ce..9bccefc 100644
--- a/com.googlecode.iterm2.plist
+++ b/com.googlecode.iterm2.plist
@@ -205,7 +205,7 @@ Maximize Active Pane
NSWindow Frame SharedPreferences
243 306 937 514 0 0 1440 877
NSWindow Frame iTerm Window 0
- 0 0 1440 877 0 0 1440 877
+ 0 23 1440 854 0 0 1440 877
NSWindow Frame iTerm Window 1
0 0 1440 877 0 0 1440 877
New Bookmarks
@@ -218,34 +218,34 @@ Maximize Active Pane
Ansi 0 Color
Blue Component
- 0.0
+ 0.30978869999999997
Green Component
- 0.0
+ 0.30978869999999997
Red Component
- 0.0
+ 0.30978869999999997
Ansi 1 Color
Blue Component
- 0.0
+ 0.37647059999999999
Green Component
- 0.0
+ 0.4235294
Red Component
- 0.73333334922790527
+ 1
Ansi 10 Color
Blue Component
- 0.3333333432674408
+ 0.67277030000000004
Green Component
1
Red Component
- 0.3333333432674408
+ 0.80941479999999999
Ansi 11 Color
Blue Component
- 0.3333333432674408
+ 0.7996491
Green Component
1
Red Component
@@ -254,29 +254,29 @@ Maximize Active Pane
Ansi 12 Color
Blue Component
- 1
+ 0.9982605
Green Component
- 0.3333333432674408
+ 0.86277559999999998
Red Component
- 0.3333333432674408
+ 0.71165029999999996
Ansi 13 Color
Blue Component
- 1
+ 0.99652090000000004
Green Component
- 0.3333333432674408
+ 0.61330589999999996
Red Component
1
Ansi 14 Color
Blue Component
- 1
+ 0.99703969999999997
Green Component
- 1
+ 0.87631029999999999
Red Component
- 0.3333333432674408
+ 0.87591359999999996
Ansi 15 Color
@@ -290,72 +290,72 @@ Maximize Active Pane
Ansi 2 Color
Blue Component
- 0.0
+ 0.37647059999999999
Green Component
- 0.73333334922790527
+ 1
Red Component
- 0.0
+ 0.65882350000000001
Ansi 3 Color
Blue Component
- 0.0
+ 0.71372550000000001
Green Component
- 0.73333334922790527
+ 1
Red Component
- 0.73333334922790527
+ 1
Ansi 4 Color
Blue Component
- 0.73333334922790527
+ 0.99607840000000003
Green Component
- 0.0
+ 0.79607839999999996
Red Component
- 0.0
+ 0.58823530000000002
Ansi 5 Color
Blue Component
- 0.73333334922790527
+ 0.99215690000000001
Green Component
- 0.0
+ 0.4509804
Red Component
- 0.73333334922790527
+ 1
Ansi 6 Color
Blue Component
- 0.73333334922790527
+ 0.99607840000000003
Green Component
- 0.73333334922790527
+ 0.77254900000000004
Red Component
- 0.0
+ 0.77647060000000001
Ansi 7 Color
Blue Component
- 0.73333334922790527
+ 0.93353169999999996
Green Component
- 0.73333334922790527
+ 0.93353169999999996
Red Component
- 0.73333334922790527
+ 0.93353169999999996
Ansi 8 Color
Blue Component
- 0.3333333432674408
+ 0.4862745
Green Component
- 0.3333333432674408
+ 0.4862745
Red Component
- 0.3333333432674408
+ 0.4862745
Ansi 9 Color
Blue Component
- 0.3333333432674408
+ 0.69019609999999998
Green Component
- 0.3333333432674408
+ 0.71372550000000001
Red Component
1
@@ -372,6 +372,19 @@ Maximize Active Pane
Background Image Location
+ Badge Color
+
+ Alpha Component
+ 0.5
+ Blue Component
+ 0.0
+ Color Space
+ sRGB
+ Green Component
+ 0.1491314172744751
+ Red Component
+ 1
+
Blinking Cursor
Blur
@@ -396,11 +409,24 @@ Maximize Active Pane
Cursor Color
Blue Component
- 0.73333334922790527
+ 0.37647059999999999
Green Component
- 0.73333334922790527
+ 0.64705880000000005
Red Component
- 0.73333334922790527
+ 1
+
+ Cursor Guide Color
+
+ Alpha Component
+ 0.25
+ Blue Component
+ 1
+ Color Space
+ sRGB
+ Green Component
+ 0.9268307089805603
+ Red Component
+ 0.70213186740875244
Cursor Text Color
@@ -730,6 +756,19 @@ Maximize Active Pane
[1;5F
+ Link Color
+
+ Alpha Component
+ 1
+ Blue Component
+ 0.73423302173614502
+ Color Space
+ sRGB
+ Green Component
+ 0.35916060209274292
+ Red Component
+ 0.0
+
Mouse Reporting
Name
@@ -755,20 +794,20 @@ Maximize Active Pane
Selected Text Color
Blue Component
- 0.0
+ 0.94760049999999996
Green Component
- 0.0
+ 0.94760049999999996
Red Component
- 0.0
+ 0.94760049999999996
Selection Color
Blue Component
- 1
+ 0.51530609999999999
Green Component
- 0.8353000283241272
+ 0.22248570000000001
Red Component
- 0.70980000495910645
+ 0.20990739999999999
Send Code When Idle
@@ -807,10 +846,11 @@ Maximize Active Pane
NoSyncAllAppVersions
3.3.9
+ 3.3.6
3.2.8
3.3.0
3.3.7
- 3.3.6
+ 3.3.12
NoSyncBFPRecents
@@ -821,6 +861,13 @@ Maximize Active Pane
NoSyncCommandHistoryHasEverBeenUsed
+ NoSyncFrame_SessionsPreferences
+
+ screenFrame
+ {{0, 0}, {1440, 900}}
+ topLeft
+ {417, 794}
+
NoSyncFrame_SharedPreferences
screenFrame
@@ -837,7 +884,7 @@ Maximize Active Pane
NoSyncLastTipTime
593204423.13678098
NoSyncLaunchExperienceControllerRunCount
- 62
+ 93
NoSyncNeverRemindPrefsChangesLostForFile
NoSyncNeverRemindPrefsChangesLostForFile_selection
@@ -1645,6 +1692,8 @@ Maximize Active Pane
OpenNoWindowsAtStartup
+ OpenTmuxWindowsIn
+ 0
PMPrintingExpandedStateForPrint2
PasteSpecialChunkDelay
@@ -1705,11 +1754,9 @@ Maximize Active Pane
SUHasLaunchedBefore
SULastCheckTime
- 2020-05-11T09:25:07Z
+ 2020-10-30T10:17:39Z
SUSendProfileInfo
- SUSkippedVersion
- 3.3.9
SUUpdateRelaunchingMarker
ShowBookmarkName
@@ -7369,6 +7416,6 @@ Maximize Active Pane
findMode_iTerm
0
iTerm Version
- 3.3.9
+ 3.3.12