Merge branch 'nd/apply-doc' into maint
commitf0acaa6b1cea3acd0b7bd137ee7b74d90f2946f5
authorJunio C Hamano <gitster@pobox.com>
Fri, 15 Apr 2016 01:37:13 +0000 (14 18:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 15 Apr 2016 01:37:13 +0000 (14 18:37 -0700)
tree2f81b8bd48cdb60c87cbd4acc92d268effc0f504
parente919f559645fb184a7660d7aeeaa5c97c5c6aa46
parent16a86d432913db209214e03206c0ec7e14b8a562
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