diff options
author | Shawn Pearce <spearce@spearce.org> | 2006-03-05 03:24:15 -0500 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-03-05 00:58:13 -0800 |
commit | de84f99c12d1819479116685393afb1ebe99810b (patch) | |
tree | 6e30242eea2f8e51c936f11ea31ad4f839afb63a /cache.h | |
parent | 46444f514bf5a1df17885283634256a86fa11196 (diff) | |
download | git-de84f99c12d1819479116685393afb1ebe99810b.tar.gz |
Add --temp and --stage=all options to checkout-index.
Sometimes it is convient for a Porcelain to be able to checkout all
unmerged files in all stages so that an external merge tool can be
executed by the Porcelain or the end-user. Using git-unpack-file
on each stage individually incurs a rather high penalty due to the
need to fork for each file version obtained. git-checkout-index -a
--stage=all will now do the same thing, but faster.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'cache.h')
-rw-r--r-- | cache.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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; |