From: Philippe Blain Date: Mon, 26 Jun 2023 16:24:47 +0000 (+0000) Subject: completion: complete --remerge-diff X-Git-Tag: v2.42.0-rc0~71^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55245d669a6c427efd9f7c1782105bea4e97a431;p=thirdparty%2Fgit.git completion: complete --remerge-diff --remerge-diff only makes sense for 'git log' and 'git show', so add it to __git_log_show_options which is referenced in the completion for these two commands. Signed-off-by: Philippe Blain Signed-off-by: Junio C Hamano --- diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 8688f7c433..11f2edf47b 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -2042,7 +2042,7 @@ __git_log_shortlog_options=" " # Options accepted by log and show __git_log_show_options=" - --diff-merges --diff-merges= --no-diff-merges + --diff-merges --diff-merges= --no-diff-merges --remerge-diff " __git_diff_merges_opts="off none on first-parent 1 separate m combined c dense-combined cc remerge r"