summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-03-07 04:58:17 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-07 04:58:17 (GMT)
commit2dcdb4c69737185f0b0e9fe08ba52b95b84f13da (patch)
tree5097e633924587ada62953ac4e6435bf56ed22a2 /cache.h
parent3ca1fff6117f971918ee353540f2633e163e6c6b (diff)
parentde84f99c12d1819479116685393afb1ebe99810b (diff)
downloadgit-2dcdb4c69737185f0b0e9fe08ba52b95b84f13da.zip
git-2dcdb4c69737185f0b0e9fe08ba52b95b84f13da.tar.gz
git-2dcdb4c69737185f0b0e9fe08ba52b95b84f13da.tar.bz2
Merge branch 'sp/checkout'
* sp/checkout: Add --temp and --stage=all options to checkout-index.
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index 8dc1de1..1f96280 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;