summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-08-16 14:22:26 -0700
committerJunio C Hamano <gitster@pobox.com>2011-08-16 14:22:26 -0700
commit50b68aeb392537a730a86349293acf046a778b74 (patch)
tree94d8d5442ef56da82a0b3c7ba50f82ffc87553c8 /git-am.sh
parentb91766295f2b873bbd4ef79c06de05aff27f8e12 (diff)
parent8499644ea7af87c02f9b878f162aa6facbd5b8a7 (diff)
downloadgit-50b68aeb392537a730a86349293acf046a778b74.tar.gz
Merge branch 'maint'
* maint: Prepare for 1.7.6.1 am: refresh the index at start and --resolved Conflicts: GIT-VERSION-GEN RelNotes
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/git-am.sh b/git-am.sh
index 463c741dfc..65924246d0 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -511,6 +511,8 @@ else
fi
fi
+git update-index -q --refresh
+
case "$resolved" in
'')
case "$HAS_HEAD" in