Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'js/maint-diff-temp-smudge'
[gitweb.git]
/
builtin-merge.c
diff --git
a/builtin-merge.c
b/builtin-merge.c
index 6d2160d0a3db1705d1372029dfa24752d453c8ec..4c119359e74cc483c47a6031f6057ac2eb06ca76 100644
(file)
--- a/
builtin-merge.c
+++ b/
builtin-merge.c
@@
-636,7
+636,7
@@
static int checkout_fast_forward(unsigned char *head, unsigned char *remote)
memset(&opts, 0, sizeof(opts));
memset(&t, 0, sizeof(t));
memset(&dir, 0, sizeof(dir));
- dir.
show_ignored = 1
;
+ dir.
flags |= DIR_SHOW_IGNORED
;
dir.exclude_per_dir = ".gitignore";
opts.dir = &dir;