completion: complete --remerge-diff

phil-blain · gitster · commit 55245d669a6c · 2023-06-26T09:40:14.000-07:00
--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 &lt;levraiphilippeblain@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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"

Original file line number	Diff line number	Diff line change
`@@ -2042,7 +2042,7 @@ __git_log_shortlog_options="`
`2042`	`2042`	`"`
`2043`	`2043`	`# Options accepted by log and show`
`2044`	`2044`	`__git_log_show_options="`
`2045`		`- --diff-merges --diff-merges= --no-diff-merges`
	`2045`	`+ --diff-merges --diff-merges= --no-diff-merges --remerge-diff`
`2046`	`2046`	`"`
`2047`	`2047`
`2048`	`2048`	`__git_diff_merges_opts="off none on first-parent 1 separate m combined c dense-combined cc remerge r"`