Merge branch 'en/check-ignore'
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 Mar 2020 23:07:18 +0000 (15:07 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 Mar 2020 23:07:18 +0000 (15:07 -0800)
commitcb2f5a8e971bdc4d08dde91c8f16a7464ef94cd8
tree8e31d0e4490723e3466d48bf9c6ce9dcb461ee12
parent0df82d99dae85dbd4f667e95020a146ea0167975
parent7ec8125fba96f47b00bb0cab3ed716557e81e7e6
Merge branch 'en/check-ignore'

"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