diff --git a/tools/git-step-rebase b/tools/git-step-rebase
index 33eff41..22c8969 100755
--- a/tools/git-step-rebase
+++ b/tools/git-step-rebase
@@ -55,12 +55,12 @@ wait_count 5
 while [ ${PARENTS} -ge 0 ]; do
   echo -e "Next: rebasing to \033[1m${BASE_BRANCH}~${PARENTS}\033[0m"
   sleep 1
-  if ! git rebase --whitespace=fix ${BASE_BRANCH}~${PARENTS}; then
+  if ! git rebase --rerere-autoupdate --whitespace=fix ${BASE_BRANCH}~${PARENTS}; then
     echo
     echo "Standard rebase failed."
     echo "Trying again, this time ignoring whitespace ..."
     git rebase --abort
-    if ! git rebase -X ignore-all-space --whitespace=fix ${BASE_BRANCH}~${PARENTS}; then
+    if ! git rebase --rerere-autoupdate -X ignore-all-space --whitespace=fix ${BASE_BRANCH}~${PARENTS}; then
       exit
     fi
   fi