Merge branch 'jc/nostat'

* jc/nostat:
"assume unchanged" git: documentation.
ls-files: split "show-valid-bit" into a different option.

diff --cc ls-files.c
Simple merge