summaryrefslogtreecommitdiff
path: root/notes-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-03-02 15:07:18 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-03-02 15:07:18 -0800
commitcb2f5a8e971bdc4d08dde91c8f16a7464ef94cd8 (patch)
tree8e31d0e4490723e3466d48bf9c6ce9dcb461ee12 /notes-merge.c
parentMerge branch 'jk/object-filter-with-bitmap' (diff)
parentcheck-ignore: fix documentation and implementation to match (diff)
downloadtgif-cb2f5a8e971bdc4d08dde91c8f16a7464ef94cd8.tar.xz
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 'notes-merge.c')
0 files changed, 0 insertions, 0 deletions