path: root/Documentation/diff-format.txt
diff options
authorAndreas Heiduk <>2017-03-02 19:03:52 (GMT)
committerJunio C Hamano <>2017-03-02 19:40:51 (GMT)
commit860cd699c285f02937a2edbdb78e8231292339a5 (patch)
tree9864d172cd90185f4af9c7ffcd218f8f50cf4a0e /Documentation/diff-format.txt
parent3bc53220cb2dcf709f7a027a3f526befd021d858 (diff)
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 <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/diff-format.txt')
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index cf52626..706916c 100644
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -78,9 +78,10 @@ Example:
:100644 100644 5be4a4...... 000000...... M file.c
-When `-z` option is not used, TAB, LF, and backslash characters
-in pathnames are represented as `\t`, `\n`, and `\\`,
+Without the `-z` option, pathnames with "unusual" characters are
+quoted as explained for the configuration variable `core.quotePath`
+(see linkgit:git-config[1]). Using `-z` the filename is output
+verbatim and the line is terminated by a NUL byte.
diff format for merges