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

git-step-rebase: slightly nicer progress report.

This commit is contained in:
Markus Hitter 2017-04-25 20:00:13 +02:00
parent b1ba8b4003
commit 92926aadf5
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/git-step-rebase
View File

@ -53,8 +53,7 @@ echo "If not, hit Ctrl-C now."
wait_count 5 wait_count 5
while [ ${PARENTS} -ge 0 ]; do while [ ${PARENTS} -ge 0 ]; do
echo "Next:" echo -e "Next: rebasing to \033[1m${BASE_BRANCH}~${PARENTS}\033[0m"
echo git rebase -X ignore-all-space --whitespace=fix ${BASE_BRANCH}~${PARENTS}
sleep 1 sleep 1
if ! git rebase -X ignore-all-space --whitespace=fix ${BASE_BRANCH}~${PARENTS}; then if ! git rebase -X ignore-all-space --whitespace=fix ${BASE_BRANCH}~${PARENTS}; then
exit exit