Merge branch 'dw/check-ignore-sans-index'
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Sep 2013 19:37:32 +0000 (12:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Sep 2013 19:37:32 +0000 (12:37 -0700)
"git check-ignore" follows the same rule as "git add" and "git
status" in that the ignore/exclude mechanism does not take effect
on paths that are already tracked. With "--no-index" option, it
can be used to diagnose which paths that should have been ignored
have been mistakenly added to the index.

* dw/check-ignore-sans-index:
check-ignore: Add option to ignore index contents

1  2 
builtin/check-ignore.c
t/t0008-ignores.sh
Simple merge
Simple merge