From: Junio C Hamano Date: Fri, 27 Oct 2006 01:45:52 +0000 (-0700) Subject: Merge branch 'jc/combined' into maint X-Git-Tag: v1.4.3.4~18 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ac1a1f9927b01df6c50a1e29d92c6e79e2daadff?ds=inline;hp=-c Merge branch 'jc/combined' into maint * jc/combined: combine-diff: honour --no-commit-id combine-diff: fix hunk_comment_line logic. combine-diff: a few more finishing touches. --- ac1a1f9927b01df6c50a1e29d92c6e79e2daadff diff --combined Documentation/diff-format.txt index 2060ae2fcb,ed4ebcbab7..e4520e28e5 --- a/Documentation/diff-format.txt +++ b/Documentation/diff-format.txt @@@ -144,10 -144,8 +144,10 @@@ the file that rename/copy produces, res dissimilarity index index .. -3. TAB, LF, and backslash characters in pathnames are - represented as `\t`, `\n`, and `\\`, respectively. +3. TAB, LF, double quote and backslash characters in pathnames + are represented as `\t`, `\n`, `\"` and `\\`, respectively. + If there is need for such substitution then the whole + pathname is put in double quotes. combined diff format @@@ -214,9 -212,9 +214,9 @@@ copying detection) are designed to wor --- 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