From b1ba8b4003cce4367ca095beee6ff75919a5cba7 Mon Sep 17 00:00:00 2001 From: Markus Hitter Date: Tue, 25 Apr 2017 19:47:02 +0200 Subject: [PATCH] git-step-rebase: --whitespace=fix was apparently fixed. --- tools/git-step-rebase | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/git-step-rebase b/tools/git-step-rebase index ab16514..9a99a4a 100755 --- a/tools/git-step-rebase +++ b/tools/git-step-rebase @@ -54,10 +54,9 @@ wait_count 5 while [ ${PARENTS} -ge 0 ]; do 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 ${BASE_BRANCH}~${PARENTS} + echo git rebase -X ignore-all-space --whitespace=fix ${BASE_BRANCH}~${PARENTS} 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 fi let PARENTS=${PARENTS}-1