Merge branch 'mz/doc-rebase-abort' into maint

diff --git a/git-am.sh b/git-am.sh
index 6cdd5910db50c96df3d149fba172750cb10c09cb..f1a03c912824a264cbe29905d53e2fe58c2c9dd6 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -507,6 +507,8 @@ else
        fi
 fi
 
+git update-index -q --refresh
+
 case "$resolved" in
 '')
        case "$HAS_HEAD" in