summaryrefslogtreecommitdiff
path: root/Documentation/git-apply.txt
diff options
context:
space:
mode:
authorLibravatar Andreas Heiduk <asheiduk@gmail.com>2017-03-02 20:03:52 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-03-02 11:40:51 -0800
commit860cd699c285f02937a2edbdb78e8231292339a5 (patch)
tree9864d172cd90185f4af9c7ffcd218f8f50cf4a0e /Documentation/git-apply.txt
parentFirst batch after 2.12 (diff)
downloadtgif-860cd699c285f02937a2edbdb78e8231292339a5.tar.xz
Documentation: improve description for core.quotePath
Linking the description for pathname quoting to the configuration variable "core.quotePath" removes inconstistent and incomplete sections while also giving two hints how to deal with it: Either with "-c core.quotePath=false" or with "-z". Signed-off-by: Andreas Heiduk <asheiduk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-apply.txt')
-rw-r--r--Documentation/git-apply.txt7
1 files changed, 3 insertions, 4 deletions
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 8ddb207409..631cbd840a 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -108,10 +108,9 @@ the information is read from the current index instead.
When `--numstat` has been given, do not munge pathnames,
but use a NUL-terminated machine-readable format.
+
-Without this option, each pathname output will have TAB, LF, double quotes,
-and backslash characters replaced with `\t`, `\n`, `\"`, and `\\`,
-respectively, and the pathname will be enclosed in double quotes if
-any of those replacements occurred.
+Without this option, pathnames with "unusual" characters are quoted as
+explained for the configuration variable `core.quotePath` (see
+linkgit:git-config[1]).
-p<n>::
Remove <n> leading slashes from traditional diff paths. The