diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-13 11:10:24 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-13 11:10:24 -0800 |
| commit | f388cec3d77751a6c20b3b10415344f5355b5a2f (patch) | |
| tree | 557f4a01f9da0851617f290aa556e56e5c07092b /unpack-trees.h | |
| parent | d0085ade9598942077f12f22b16978411d15188a (diff) | |
| parent | 22f741dab7cc93f00f7cf96cd65d7481677cd855 (diff) | |
| download | git-f388cec3d77751a6c20b3b10415344f5355b5a2f.tar.gz git-f388cec3d77751a6c20b3b10415344f5355b5a2f.tar.xz | |
Merge branch 'jc/read-tree-ignore'
* jc/read-tree-ignore:
read-tree: document --exclude-per-directory
Loosen "working file will be lost" check in Porcelain-ish
read-tree: further loosen "working file will be lost" check.
Diffstat (limited to 'unpack-trees.h')
| -rw-r--r-- | unpack-trees.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/unpack-trees.h b/unpack-trees.h index c4601621c..191f7442f 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; |