Merge branch 'en/check-ignore' into maint
commit16a4bf10359edf34a7c62d6466dab2e33060d332
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Mar 2020 22:02:23 +0000 (17 15:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Mar 2020 22:02:23 +0000 (17 15:02 -0700)
tree109910396fb1d1f2339976bb23532f8306446f03
parent3246495a5cb9a4e81be16053555b9ee984522a79
parent7ec8125fba96f47b00bb0cab3ed716557e81e7e6
Merge branch 'en/check-ignore' into maint

"git check-ignore" did not work when the given path is explicitly
marked as not ignored with a negative entry in the .gitignore file.

* en/check-ignore:
  check-ignore: fix documentation and implementation to match
Documentation/git-check-ignore.txt