diff options
| author | Elijah Newren <newren@gmail.com> | 2023-10-08 08:45:24 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-09 21:06:44 +0200 |
| commit | 4d542687fcea27c6cce9a79415ad8cb1a817697c (patch) | |
| tree | e72600a6fffb78f19714ea08ea4212cedf0c1258 /Documentation/diff-generate-patch.txt | |
| parent | documentation: fix whitespace issues (diff) | |
| download | git-4d542687fcea27c6cce9a79415ad8cb1a817697c.tar.xz git-4d542687fcea27c6cce9a79415ad8cb1a817697c.zip | |
documentation: add some commas where they are helpful
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 988e33de70..4b5aa5c2e0 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 an 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 @@ -197,7 +197,7 @@ added, from the point of view of that parent). In the above example output, the function signature was changed from both files (hence two `-` removals from both file1 and file2, plus `++` to mean one line that was added does not appear -in either file1 or file2). Also eight other lines are the same +in either file1 or file2). Also, eight other lines are the same from file1 but do not appear in file2 (hence prefixed with `+`). When shown by `git diff-tree -c`, it compares the parents of a |