From a1ae95058f61d5b2bf9e30153da52ed50cab1e3a Mon Sep 17 00:00:00 2001 From: Xiao Pan Date: Wed, 17 Apr 2024 05:25:23 -0700 Subject: refactor --- sh/ccp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sh/ccp') diff --git a/sh/ccp b/sh/ccp index c30734c..f0ba485 100755 --- a/sh/ccp +++ b/sh/ccp @@ -18,9 +18,9 @@ for branch in $(git branch | awk '{print ($1=="*")?$2:$1}'); do git pull done -git checkout master - < "$XDG_DATA_HOME/mydata/cfgl_cherry_picked" read -r picked +# need checkout to master branch to list new master branch commits +git checkout master for commit in $(git rev-list --reverse "$picked..HEAD"); do git show "$commit" printf 'Enter branch name to cherry pick this commit: (a for all, enter to skip)\n' -- cgit v1.2.3-70-g09d2