summaryrefslogtreecommitdiff
path: root/builtin/merge-base.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-11-06 13:11:26 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-11-06 13:11:26 +0900
commitda7996aaf75fcd58c0fb787c15ee9569140a2f9c (patch)
treed7f70aca35d260f801e61976e53a90ad6a7350e4 /builtin/merge-base.c
parentMerge branch 'ao/check-resolve-ref-unsafe-result' (diff)
parentstatus: do not get confused by submodules in excluded directories (diff)
downloadtgif-da7996aaf75fcd58c0fb787c15ee9569140a2f9c.tar.xz
Merge branch 'js/submodule-in-excluded'
"git status --ignored -u" did not stop at a working tree of a separate project that is embedded in an ignored directory and listed files in that other project, instead of just showing the directory itself as ignored. * js/submodule-in-excluded: status: do not get confused by submodules in excluded directories
Diffstat (limited to 'builtin/merge-base.c')
0 files changed, 0 insertions, 0 deletions