Merge branch 'jn/branch-move-to-self' into maint

[git.git] / builtin / checkout.c

diff --git a/builtin/checkout.c b/builtin/checkout.c
index ca00a8538ae2e49458046a41aa48f3285a9b6de9..44e73b5a4fc57f206c09b4c630d2028bf7475a51 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -411,7 +411,7 @@ static int merge_working_tree(struct checkout_opts *opts,
                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);