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

git-step-rebase: --whitespace=fix was apparently fixed.

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

5
tools/git-step-rebase
View File

@ -54,10 +54,9 @@ wait_count 5
while [ ${PARENTS} -ge 0 ]; do while [ ${PARENTS} -ge 0 ]; do
echo "Next:" echo "Next:"
#echo git rebase -X ignore-all-space --whitespace=fix ${BASE_BRANCH}~${PARENTS} # hält script bei Fehlern nicht an echo git rebase -X ignore-all-space --whitespace=fix ${BASE_BRANCH}~${PARENTS}
echo git rebase -X ignore-all-space ${BASE_BRANCH}~${PARENTS}
sleep 1 sleep 1
if ! git rebase -X ignore-all-space ${BASE_BRANCH}~${PARENTS}; then if ! git rebase -X ignore-all-space --whitespace=fix ${BASE_BRANCH}~${PARENTS}; then
exit exit
fi fi
let PARENTS=${PARENTS}-1 let PARENTS=${PARENTS}-1