X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fdiff-format.txt;h=e4520e28e53661159454e02c703be772d43bbc09;hb=0f03ca946142bd656c1af9ff811cb9efbc8314da;hp=2060ae2fcb9935ed11ecb71a093ad22c661339bf;hpb=fb8e23fae2ac9af831260079b14eabad316f3769;p=git.git diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt index 2060ae2fc..e4520e28e 100644 --- a/Documentation/diff-format.txt +++ b/Documentation/diff-format.txt @@ -214,9 +214,9 @@ copying detection) are designed to work with diff of two --- a/file +++ b/file + -Contrary to two-line header for traditional 'unified' diff -format, and similar to filenames in ordinary "diff header", -/dev/null is not used for creation or deletion. +Similar to two-line header for traditional 'unified' diff +format, `/dev/null` is used to signal created or deleted +files. 4. Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format