git-update-index --unresolve