diff --git a/git-rebase.sh b/git-rebase.sh
index 7d3a5d0e718eebe6fb5d1fa3362f2a7087d6e691..20f74d416732e681d3b44ea610e428529af49235 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
To restore the original branch and stop rebasing run \"git rebase --abort\".
"
unset newbase
-strategy=recursive
+case "${GIT_USE_RECUR_FOR_RECURSIVE}" in
+'')
+ strategy=recursive ;;
+?*)
+ strategy=recur ;;
+esac
+
do_merge=
dotest=$GIT_DIR/.dotest-merge
prec=4
shift
done
+case "$strategy,${GIT_USE_RECUR_FOR_RECURSIVE}" in
+recursive,?*)
+ strategy=recur ;;
+esac
+
# Make sure we do not have .dotest
if test -z "$do_merge"
then