diff options
| author | Elijah Newren <newren@gmail.com> | 2023-10-08 06:45:16 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-09 12:06:29 -0700 |
| commit | 3771d002571f6fc796ff3f54e9d5b875826e62ed (patch) | |
| tree | 87a73898a10c5182a3ab632a4207b4f846019e3a /Documentation/diff-generate-patch.txt | |
| parent | 03b3431e6a36d9a529f49d938168043b463ca24b (diff) | |
| download | git-3771d002571f6fc796ff3f54e9d5b875826e62ed.tar.gz | |
documentation: fix choice of 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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt index 65e0b1646e..4b307cb51b 100644 --- a/Documentation/diff-generate-patch.txt +++ b/Documentation/diff-generate-patch.txt @@ -156,7 +156,7 @@ format, `/dev/null` is used to signal created or deleted 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, +two-line from-file/to-file you get an N+1 line from-file/to-file header, where N is the number of parents in the merge commit: --- a/file |