diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-26 00:05:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-26 01:18:49 -0700 |
| commit | d5f6a01af0658bc0ec5f068d81ba321be94526d5 (patch) | |
| tree | 74c39f25881a87278e0376abc67cf47ff0d37690 /Documentation | |
| parent | 0ac3056850394723c9b407754b44d3d37f1dcc3f (diff) | |
| download | git-d5f6a01af0658bc0ec5f068d81ba321be94526d5.tar.gz | |
combine-diff: a few more finishing touches.
"new file" and "deleted file" were already reported in the
original code, but the logic was not as transparent as it could
have. This uses a few variables and more comments to clarify
the flow. The rule is: (1) if a path exists in the merge result
when no parent had it, we report "new" (otherwise it came from
the parents, as opposed to have added by the evil merge). (2) if
the path does not exist in the merge result, it is "deleted".
Since we can say "new" and "deleted", there is no reason not to
follow the /dev/null convention. This fixes it.
Appending function name after @@@ ... @@@ is trivial, so
implement it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
| -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 174d63a1ee..ed4ebcbab7 100644 --- a/Documentation/diff-format.txt +++ b/Documentation/diff-format.txt @@ -212,9 +212,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 |