Andrew's git / gitweb.git / diff
?
Merge branch 'rs/check-ignore-multi' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Feb 2018 21:34:31 +0000 (13:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Feb 2018 21:34:31 +0000 (13:34 -0800)
"git check-ignore" with multiple paths got confused when one is a
file and the other is a directory, which has been fixed.

* rs/check-ignore-multi:
check-ignore: fix mix of directories and other file types

Trivial merge