completion: complete --diff-merges, its options and --no-diff-merges
commit98aaeb2f775949faac4840ba90b10d8cc328a71b
authorPhilippe Blain <levraiphilippeblain@gmail.com>
Mon, 26 Jun 2023 16:24:46 +0000 (26 16:24 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 Jun 2023 16:40:14 +0000 (26 09:40 -0700)
treeb74b2c7ce72d82e65b15f475837536b43ec0fc28
parentd520d98382d3ad7071bc33e2ea2204a4c64ba7bb
completion: complete --diff-merges, its options and --no-diff-merges

The flags --[no-]diff-merges only make sense for 'git log' and 'git
show', so add a new variable __git_log_show_options for options only
relevant to these two commands, and add them there. Also add
__git_diff_merges_opts and list the accepted values for --diff-merges,
and use it in _git_log and _git_show.

Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/completion/git-completion.bash