diff options
| author | Sergey Organov <sorganov@gmail.com> | 2020-12-21 18:19:57 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-21 13:47:32 -0800 |
| commit | 8efd2efc32c41c7dcc2bf86a11fa89377f1c8d94 (patch) | |
| tree | fff274b17527d147c9a49677d930dc1d5b672260 /Documentation/diff-generate-patch.txt | |
| parent | b5ffa9ec10a3b82a1530d6f7628bd3ef9e8dd037 (diff) | |
| download | git-8efd2efc32c41c7dcc2bf86a11fa89377f1c8d94.tar.gz | |
doc/diff-generate-patch: mention new --diff-merges option
Mention --diff-merges instead of -m in a note to merge formats to aid
discoverability, as -m is now described among --diff-merges options
anyway.
Signed-off-by: Sergey Organov <sorganov@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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt index b10ff4caa6..2db8eacc3e 100644 --- a/Documentation/diff-generate-patch.txt +++ b/Documentation/diff-generate-patch.txt @@ -81,9 +81,9 @@ Combined diff format Any diff-generating command can take the `-c` or `--cc` option to 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 the `-m` option to any -of these commands to force generation of diffs with individual parents -of a merge. +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. A "combined diff" format looks like this: |