diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-26 18:45:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-26 18:45:52 -0700 |
| commit | ac1a1f9927b01df6c50a1e29d92c6e79e2daadff (patch) | |
| tree | 06475e2ffc028329193d2f0227033072fa54c57c /Documentation/diff-format.txt | |
| parent | fb8e23fae2ac9af831260079b14eabad316f3769 (diff) | |
| parent | 44152787bcb4fd003d1f5b8c2a7591445cee8f20 (diff) | |
| download | git-ac1a1f9927b01df6c50a1e29d92c6e79e2daadff.tar.gz git-ac1a1f9927b01df6c50a1e29d92c6e79e2daadff.tar.xz | |
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.
Diffstat (limited to 'Documentation/diff-format.txt')
| -rw-r--r-- | Documentation/diff-format.txt | 6 |
1 files changed, 3 insertions, 3 deletions
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 |