X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fdiff-format.txt;h=d1d0d2d3dc8760a8030313de3dd14a942d0fc2bf;hb=1bd8c8f00b1c7facb67c99047fe777b53f2c49ff;hp=dacd8fb53488fadd7ebb6c1964e60a60072eae80;hpb=d67c4af41f7975940e8fec6405411581570eb672;p=git.git diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt index dacd8fb5..d1d0d2d3 100644 --- a/Documentation/diff-format.txt +++ b/Documentation/diff-format.txt @@ -55,6 +55,11 @@ 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 `\\`, +respectively. + + Generating patches with -p -------------------------- @@ -106,7 +111,7 @@ For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1 parameter, . -Git specific extension to diff format +git specific extension to diff format ------------------------------------- What -p option produces is slightly different from the @@ -137,3 +142,7 @@ the file that rename/copy produces, respectively. rename to similarity index dissimilarity index + index .. + +3. TAB, LF, and backslash characters in pathnames are + represented as `\t`, `\n`, and `\\`, respectively.