summaryrefslogtreecommitdiff
path: root/Documentation/diff-format.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-10-27 01:45:52 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-10-27 01:45:52 (GMT)
commitac1a1f9927b01df6c50a1e29d92c6e79e2daadff (patch)
tree06475e2ffc028329193d2f0227033072fa54c57c /Documentation/diff-format.txt
parentfb8e23fae2ac9af831260079b14eabad316f3769 (diff)
parent44152787bcb4fd003d1f5b8c2a7591445cee8f20 (diff)
downloadgit-ac1a1f9927b01df6c50a1e29d92c6e79e2daadff.zip
git-ac1a1f9927b01df6c50a1e29d92c6e79e2daadff.tar.gz
git-ac1a1f9927b01df6c50a1e29d92c6e79e2daadff.tar.bz2
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.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index 2060ae2..e4520e2 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