]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'en/check-ignore' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Mar 2020 22:02:23 +0000 (15:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Mar 2020 22:02:23 +0000 (15:02 -0700)
"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

1  2 
Documentation/git-check-ignore.txt

Simple merge