Merge branch 'subtree-commit' into subtree-only
Use 'git reset' to reset index

This may differ from 'git read-tree HEAD'. For example in case of an
empty repository.
Fix NOP test