diff options
| author | Sergey Organov <sorganov@gmail.com> | 2023-10-09 19:05:33 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-09 22:47:29 +0300 |
| commit | be3820c60cc82e0ded1d3f3dcc19fbd59ce56aa2 (patch) | |
| tree | b4b4d7d631c2c5b581d22f0747035ff81ad01765 /Documentation/git-log.txt | |
| parent | 3a06386e314565108ad56a9bdb8f7b80ac52fb69 (diff) | |
diff-merges: improve --diff-merges documentation
* Put descriptions of convenience shortcuts first, so they are the
first things reader observes rather than lengthy detailed stuff.
* Get rid of very long line containing all the --diff-merges formats
by replacing them with <format>, and putting each supported format
on its own line.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-log.txt')
| -rw-r--r-- | Documentation/git-log.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 2a66cf8880..9b7ec96e76 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -124,7 +124,7 @@ Note that unless one of `--diff-merges` variants (including short will not show a diff, even if a diff format like `--patch` is selected, nor will they match search options like `-S`. The exception is when `--first-parent` is in use, in which case `first-parent` is -the default format. +the default format for merge commits. :git-log: 1 :diff-merges-default: `off` |