projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: db55bb5 d60771e)
Merge branch 'rs/check-ignore-multi' into jch
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Feb 2018 20:46:37 +0000 (12:46 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Feb 2018 20:46:38 +0000 (12:46 -0800)
commit8ae273fc8d60a93c1df2958530fc8ad912a00e80
tree65775b8327e7530c7a50fdc29c51f63d08d3eb33tree | snapshot
parentdb55bb5a64924aae1bbec402000a0d786b740bf4commit | diff
parentd60771e93046e9e11183c6ff1fcafd334f8c0453commit | diff
Merge branch 'rs/check-ignore-multi' into jch

"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
Unnamed repository; edit this file 'description' to name the repository.