summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2016-03-24 18:56:17 +0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-03-24 10:16:52 -0700
commit16a86d432913db209214e03206c0ec7e14b8a562 (patch)
tree649f351090acda1cb562a43b0e0855dc3331edf5 /Documentation
parentgit-apply.txt: remove a space (diff)
downloadtgif-16a86d432913db209214e03206c0ec7e14b8a562.tar.xz
git-apply.txt: mention the behavior inside a subdir
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-apply.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 5444d2ffeb..8ddb207409 100644
--- 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,