josh
/
Teacup_Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-step-rebase: remove pause. 

This script is now reliable enough to no longer need investigation
stops.

One can still stop an ongoing step-rebase by hitting Ctrl-C, then
doing a 'git rebase --abort'.
This commit is contained in:
Markus Hitter 2017-06-04 17:13:41 +02:00
parent d3867f112c
commit a88bf4ef16
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/git-step-rebase
View File

@ -54,7 +54,6 @@ wait_count 5
while [ ${PARENTS} -ge 0 ]; do while [ ${PARENTS} -ge 0 ]; do
echo -e "Next: rebasing to \033[1m${BASE_BRANCH}~${PARENTS}\033[0m" echo -e "Next: rebasing to \033[1m${BASE_BRANCH}~${PARENTS}\033[0m"
sleep 1
if ! git rebase --rerere-autoupdate --whitespace=fix ${BASE_BRANCH}~${PARENTS}; then if ! git rebase --rerere-autoupdate --whitespace=fix ${BASE_BRANCH}~${PARENTS}; then
echo echo
echo "Standard rebase failed." echo "Standard rebase failed."