diff --git a/builtin/checkout.c b/builtin/checkout.c
index a7a493cecf08b20f32e4161dd5009fd2c3b97448..7ea9f29aa6d24edf44431161208a306798e69623 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
topts.fn = twoway_merge;
topts.dir = xcalloc(1, sizeof(*topts.dir));
topts.dir->flags |= DIR_SHOW_IGNORED;
- topts.dir->exclude_per_dir = ".gitignore";
+ setup_standard_excludes(topts.dir);
tree = parse_tree_indirect(old->commit ?
old->commit->object.sha1 :
EMPTY_TREE_SHA1_BIN);