path: root/unpack-trees.h
diff options
authorJunio C Hamano <>2006-12-05 00:00:46 (GMT)
committerJunio C Hamano <>2006-12-06 07:25:52 (GMT)
commitf8a9d4287277ed15d3f0d61004f4510c59f1f392 (patch)
treeb3a75baf61f97d601d2e4d7cf79c8399b902d9bf /unpack-trees.h
parent8ebe185bbf3f1f4f59bcc61e3d1849a76f6af983 (diff)
read-tree: further loosen "working file will be lost" check.
This follows up commit ed93b449 where we removed overcautious "working file will be lost" check. A new option "--exclude-per-directory=.gitignore" can be used to tell the "git-read-tree" command that the user does not mind losing contents in untracked files in the working tree, if they need to be overwritten by a merge (either a two-way "switch branches" merge, or a three-way merge). Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'unpack-trees.h')
1 files changed, 1 insertions, 0 deletions
diff --git a/unpack-trees.h b/unpack-trees.h
index c460162..191f744 100644
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -16,6 +16,7 @@ struct unpack_trees_options {
int verbose_update;
int aggressive;
const char *prefix;
+ struct dir_struct *dir;
merge_fn_t fn;
int head_idx;