diff options
| author | Elijah Newren <newren@gmail.com> | 2023-10-08 06:45:03 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-09 12:04:21 -0700 |
| commit | cf6cac20059123d6ec3f867bb3692df62db52cf9 (patch) | |
| tree | 99e0ee363183782b239257d69d28282c44100136 /Documentation/diff-generate-patch.txt | |
| parent | 3a06386e314565108ad56a9bdb8f7b80ac52fb69 (diff) | |
| download | git-cf6cac20059123d6ec3f867bb3692df62db52cf9.tar.gz | |
documentation: wording improvements
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt index 546adf79e5..55df903abd 100644 --- a/Documentation/diff-generate-patch.txt +++ b/Documentation/diff-generate-patch.txt @@ -146,7 +146,7 @@ information about detected contents movement (renames and copying detection) are designed to work with diff of two <tree-ish> and are not used by combined diff format. -3. It is followed by two-line from-file/to-file header +3. It is followed by a two-line from-file/to-file header: --- a/file +++ b/file @@ -157,7 +157,7 @@ files. + However, if the --combined-all-paths option is provided, instead of a two-line from-file/to-file you get a N+1 line from-file/to-file header, -where N is the number of parents in the merge commit +where N is the number of parents in the merge commit: --- a/file --- a/file |