Merge branch 'jc/advice-doc' into maint

diff --git a/builtin/merge.c b/builtin/merge.c
index 2870a6af6fbc868455f2961483cfbfdb065a1a14..138737624807389ccb903a5cd03840d63b7cbf6f 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -775,7 +775,7 @@ int checkout_fast_forward(const unsigned char *head, const unsigned char *remote
        memset(&t, 0, sizeof(t));
        memset(&dir, 0, sizeof(dir));
        dir.flags |= DIR_SHOW_IGNORED;
-       dir.exclude_per_dir = ".gitignore";
+       setup_standard_excludes(&dir);
        opts.dir = &dir;
 
        opts.head_idx = 1;