From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Feb 2018 21:34:31 +0000 (-0800)
Subject: Merge branch 'rs/check-ignore-multi' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/43cb0704af1a41c9cba8e9377e413c6a1e7983e2

Merge branch 'rs/check-ignore-multi' into next

"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
---

43cb0704af1a41c9cba8e9377e413c6a1e7983e2