projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 072df8e d60771e)
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)
commit43cb0704af1a41c9cba8e9377e413c6a1e7983e2
treed2b0573612769bfee159b1aa321748ce0ad86970tree | snapshot
parent072df8ed5b9ed549fd5417d793c8268b04dd4fdccommit | diff
parentd60771e93046e9e11183c6ff1fcafd334f8c0453commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.