Add clean.requireForce option, and add -f option to git-clean to override it

diff --git a/unpack-trees.h b/unpack-trees.h
index c4601621cd71ac6e750c90bd3ac4b426d8e12369..fee7da43822b63e5b1f24444e5c51c43d3ff5760 100644 (file)
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -16,6 +16,8 @@ struct unpack_trees_options {
        int verbose_update;
        int aggressive;
        const char *prefix;
+       int pos;
+       struct dir_struct *dir;
        merge_fn_t fn;
 
        int head_idx;