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 /git-merge-one-file.sh | |
| parent | doc/git-log: describe new --diff-merges options (diff) | |
| download | tgif-8efd2efc32c41c7dcc2bf86a11fa89377f1c8d94.tar.xz | |
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 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions