doc/git-show: include --diff-merges description
authorSergey Organov <redacted>
Mon, 21 Dec 2020 15:19:59 +0000 (18:19 +0300)
committerJunio C Hamano <redacted>
Mon, 21 Dec 2020 21:47:32 +0000 (13:47 -0800)
commit1d24509b7b865115836982267a5e54b2f7d77c42
tree44cf3e0bc89d3dfc755f8a859b8eaf91332f9cdc
parente58142add40e0db354eaed9554d1b0c871e23f7d
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
Documentation/diff-options.txt
Documentation/git-log.txt
Documentation/git-show.txt
git clone https://git.99rst.org/PROJECT