From: Philippe Blain Date: Mon, 26 Jun 2023 16:24:39 +0000 (+0000) Subject: completion: complete --no-relative X-Git-Tag: v2.42.0-rc0~71^2~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ffcccc62b02ff41d5b436ea7cbd852bb2bd83bf8;p=thirdparty%2Fgit.git completion: complete --no-relative Add --no-relative to __git_diff_common_options in the completion script, and move --relative from __git_diff_difftool_options to __git_diff_common_options since it applies to more than just diff and difftool. 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 13d6730f33..f4e773cb99 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1741,6 +1741,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --color-moved-ws= --no-color-moved-ws --full-index --binary --abbrev --diff-filter= --find-copies --find-object --find-renames + --no-relative --relative --find-copies-harder --ignore-cr-at-eol --text --ignore-space-at-eol --ignore-space-change --ignore-all-space --ignore-blank-lines --exit-code @@ -1762,7 +1763,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary # Options for diff/difftool __git_diff_difftool_options="--cached --staged --pickaxe-all --pickaxe-regex - --base --ours --theirs --no-index --relative --merge-base + --base --ours --theirs --no-index --merge-base --ita-invisible-in-index --ita-visible-in-index $__git_diff_common_options"