diff options
| author | Elijah Newren <newren@gmail.com> | 2023-10-08 06:45:17 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-09 12:06:29 -0700 |
| commit | 0a4f051f9318c3dd9db69c4bebecdc6d160a5fc6 (patch) | |
| tree | 6c5654ff388c603eb020df9d8b4cd7acc2b3b862 /Documentation/diff-generate-patch.txt | |
| parent | 3771d002571f6fc796ff3f54e9d5b875826e62ed (diff) | |
| download | git-0a4f051f9318c3dd9db69c4bebecdc6d160a5fc6.tar.gz | |
documentation: add missing article
Diff best viewed with --color-diff.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-generate-patch.txt')
| -rw-r--r-- | Documentation/diff-generate-patch.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt index 4b307cb51b..cf1958ca63 100644 --- a/Documentation/diff-generate-patch.txt +++ b/Documentation/diff-generate-patch.txt @@ -25,9 +25,9 @@ The `a/` and `b/` filenames are the same unless rename/copy is involved. Especially, even for a creation or a deletion, `/dev/null` is _not_ used in place of the `a/` or `b/` filenames. + -When rename/copy is involved, `file1` and `file2` show the +When a rename/copy is involved, `file1` and `file2` show the name of the source file of the rename/copy and the name of -the file that rename/copy produces, respectively. +the file that the rename/copy produces, respectively. 2. It is followed by one or more extended header lines: @@ -89,7 +89,7 @@ produce a 'combined diff' when showing a merge. This is the default format when showing merges with linkgit:git-diff[1] or linkgit:git-show[1]. Note also that you can give suitable `--diff-merges` option to any of these commands to force generation of -diffs in specific format. +diffs in a specific format. A "combined diff" format looks like this: @@ -143,7 +143,7 @@ or like this (when the `--cc` option is used): The `mode <mode>,<mode>..<mode>` line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and -copying detection) are designed to work with diff of two +copying detection) are designed to work with the diff of two <tree-ish> and are not used by combined diff format. 3. It is followed by a two-line from-file/to-file header: @@ -151,7 +151,7 @@ copying detection) are designed to work with diff of two --- a/file +++ b/file + -Similar to two-line header for traditional 'unified' diff +Similar to the two-line header for the traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files. + |