diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-16 21:22:26 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-16 21:22:26 (GMT) |
| commit | 50b68aeb392537a730a86349293acf046a778b74 (patch) | |
| tree | 94d8d5442ef56da82a0b3c7ba50f82ffc87553c8 /git-am.sh | |
| parent | b91766295f2b873bbd4ef79c06de05aff27f8e12 (diff) | |
| parent | 8499644ea7af87c02f9b878f162aa6facbd5b8a7 (diff) | |
| download | git-50b68aeb392537a730a86349293acf046a778b74.zip git-50b68aeb392537a730a86349293acf046a778b74.tar.gz git-50b68aeb392537a730a86349293acf046a778b74.tar.bz2 | |
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-x | git-am.sh | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -511,6 +511,8 @@ else fi fi +git update-index -q --refresh + case "$resolved" in '') case "$HAS_HEAD" in |