Teach update-index about --ignore-submodules

diff --git a/git-rebase.sh b/git-rebase.sh
index c43afe51abe065950f3d3ba2aa71bb157dd04bc8..68855c18ae62ef6f4a3fdacb6f8de9c57511aa79 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -353,7 +353,7 @@ orig_head=$branch
 mb=$(git merge-base "$onto" "$branch")
 if test "$upstream" = "$onto" && test "$mb" = "$onto" &&
        # linear history?
-       ! git rev-list --parents "$onto".."$branch" | grep " .* " > /dev/null
+       ! (git rev-list --parents "$onto".."$branch" | grep " .* ") > /dev/null
 then
        # Lazily switch to the target branch if needed...
        test -z "$switch_to" || git checkout "$switch_to"