diff options
| author | Sergey Organov <sorganov@gmail.com> | 2020-12-21 18:19:59 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-21 13:47:32 -0800 |
| commit | 1d24509b7b865115836982267a5e54b2f7d77c42 (patch) | |
| tree | 44cf3e0bc89d3dfc755f8a859b8eaf91332f9cdc /Documentation/git-show.txt | |
| parent | e58142add40e0db354eaed9554d1b0c871e23f7d (diff) | |
| download | git-1d24509b7b865115836982267a5e54b2f7d77c42.tar.gz | |
doc/git-show: include --diff-merges description
Move description of --diff-merges option from git-log.txt to
diff-options.txt so that it is included in the git-show help.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-show.txt')
| -rw-r--r-- | Documentation/git-show.txt | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt index fcf528c1b3..2b1bc7288d 100644 --- a/Documentation/git-show.txt +++ b/Documentation/git-show.txt @@ -45,10 +45,13 @@ include::pretty-options.txt[] include::pretty-formats.txt[] -COMMON DIFF OPTIONS -------------------- +DIFF FORMATTING +--------------- +The options below can be used to change the way `git show` generates +diff output. :git-log: 1 +:diff-merges-default: `dense-combined` include::diff-options.txt[] include::diff-generate-patch.txt[] |