kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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 <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Philippe Blain 2023-06-26 16:24:47 +00:00 committed by Junio C Hamano
parent 98aaeb2f77
commit 55245d669a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/completion/git-completion.bash
View File

@ -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"