diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-03-02 15:07:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-02 15:07:18 -0800 |
| commit | cb2f5a8e971bdc4d08dde91c8f16a7464ef94cd8 (patch) | |
| tree | 8e31d0e4490723e3466d48bf9c6ce9dcb461ee12 /merge-recursive.c | |
| parent | 0df82d99dae85dbd4f667e95020a146ea0167975 (diff) | |
| parent | 7ec8125fba96f47b00bb0cab3ed716557e81e7e6 (diff) | |
| download | git-cb2f5a8e971bdc4d08dde91c8f16a7464ef94cd8.tar.gz | |
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
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions
