Merge git://git.bogomips.org/git-svn

diff --git a/git-rebase.sh b/git-rebase.sh
index ab4afa7dee377707484e7f76c7d44ac955f09397..2d88742cecc5037b945b5e01fba0674177ab6a74 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -208,6 +208,7 @@ do
                test -d "$dotest" -o -d "$GIT_DIR"/rebase-apply ||
                        die "No rebase in progress?"
 
+               git update-index --ignore-submodules --refresh &&
                git diff-files --quiet --ignore-submodules || {
                        echo "You must edit all merge conflicts and then"
                        echo "mark them as resolved using git add"