]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 14599b4 d60771e)
Merge branch 'rs/check-ignore-multi'
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 Feb 2018 18:33:56 +0000 (10:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Feb 2018 18:33:56 +0000 (10:33 -0800)
commit796a788a1c1a2f6a93763312a840d7ed67a8e32f
tree6cdb37210290324be042c9aa63c62313e3abe52btree | snapshot
parent14599b48c0a145452db4363f4eee4d3fc6187d05commit | diff
parentd60771e93046e9e11183c6ff1fcafd334f8c0453commit | diff
Merge branch 'rs/check-ignore-multi'

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