Merge branch 'sp/checkout' into next

* sp/checkout:
  Add --temp and --stage=all options to checkout-index.
  cosmetics: change from 'See-Also' to 'See Also'
  git-commit --amend: allow empty commit.

1 files changed, 1 insertions, 1 deletions

diff --git a/cache.h b/cache.h
index 8dc1de16e4..1f962809b0 100644
--- a/cache.h
+++ b/cache.h
@@ -262,7 +262,7 @@ struct checkout {
 		 refresh_cache:1;
 };
 
-extern int checkout_entry(struct cache_entry *ce, struct checkout *state);
+extern int checkout_entry(struct cache_entry *ce, struct checkout *state, char *topath);
 
 extern struct alternate_object_database {
 	struct alternate_object_database *next;