Merge branch 'da/user-useconfigonly'

diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 5444d2ffebe601ec1cfced5232f1f7521878e76a..8ddb207409df99825b561be42234e9c23707287d 100644 (file)
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -21,6 +21,8 @@ SYNOPSIS
 DESCRIPTION
 -----------
 Reads the supplied diff output (i.e. "a patch") and applies it to files.
+When running from a subdirectory in a repository, patched paths
+outside the directory are ignored.
 With the `--index` option the patch is also applied to the index, and
 with the `--cached` option the patch is only applied to the index.
 Without these options, the command applies the patch only to files,