mirror of
https://github.com/git/git.git
synced 2024-09-29 01:32:20 +02:00
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>
This commit is contained in:
parent
98aaeb2f77
commit
55245d669a
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user