X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Fcheckout.c;h=51840b9784f0daec21087ec101304eaa6cbf73cd;hb=3bb8d69cddbcad4bd4ae3d1281c42c1aeb297355;hp=2a8077242500d54ac50d5829a86b14803fc69126;hpb=d7a0129b3cf40e4f001295a22e2e9f8f6cbc14a4;p=git.git

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 2a8077242..51840b978 100644
--- 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);