From 9fed53d721ef57e50847354361bdc3e563e96f09 Mon Sep 17 00:00:00 2001
From: typebrook <typebrook@gmail.com>
Date: Wed, 5 Feb 2020 19:18:06 +0800
Subject: update

---
 alias | 1 +
 tigrc | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/alias b/alias
index f4b23c9..343cea0 100644
--- a/alias
+++ b/alias
@@ -120,6 +120,7 @@ gcg() {
     git clone git@github.com:$1/$2.git && cd $(basename $2) 
 }
 alias gls='git log -S'
+alias cdgw='cd .github/workflows'
 alias cdgs='cd $(git submodule status | sed "s/^.//" | cut -d" "  -f2)' # cd to first submodule
 github_release_asset() {
     command="upload-github-release-asset.sh\n github_api_token=$(cat ~/settings/tokens/github)\n owner=typebrook\n repo=tig\n tag=LATEST\n filename=$(which tig)\n overwrite=false"
diff --git a/tigrc b/tigrc
index 35e4af4..a546ba1 100644
--- a/tigrc
+++ b/tigrc
@@ -144,8 +144,9 @@ bind main pU ?git pull --rebase
 bind main uu ?git reset %(commit) --soft
 bind main uh ?git reset %(commit) --hard
 bind main uS ?sh -c "git reset %(commit) && git stash push -m 'deprecated from reset'" # reset and stash the changes
-bind main B !?git rebase --rebase-merges -i %(commit)
+bind main B !?git rebase -i %(commit)
 bind main gb !?git rebase --onto '%(prompt Rebase onto which branch? )' %(commit) %(repo:head)
+bind main gB !?git rebase --rebase-merges -i %(commit)
 bind main ! ?git revert %(commit)
 
 # tag
@@ -186,7 +187,7 @@ bind main I >sh -c "hub issue | tig"
 ## Statistics
 bind main gc >sh -c 'cloc --git %(commit) | tig'
 ## Script to bump Android version
-bind main <C-B> !sh scripts/bump_version.sh
+bind main <C-B> ! scripts/bump_version.sh && scripts/whatsnew.sh
 
 # note
 #bind generic gnn !git notes edit %(commit)
-- 
cgit v1.2.3-70-g09d2