Merge branch 'nd/apply-doc' into maint

A minor documentation update. * nd/apply-doc: git-apply.txt: mention the behavior inside a subdir git-apply.txt: remove a space

Junio C Hamano committed Apr 14, 2016 at 18:37 UTC f0acaa6b1cea3acd0b7bd137ee7b74d90f2946f5

No changes.