]> git.ipfire.org Git - thirdparty/git.git/commitdiff
completion: complete --no-relative
authorPhilippe Blain <levraiphilippeblain@gmail.com>
Mon, 26 Jun 2023 16:24:39 +0000 (16:24 +0000)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 Jun 2023 16:40:12 +0000 (09:40 -0700)
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 <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/completion/git-completion.bash

index 13d6730f33d4d0128fc067ace8b9fa2c2007bb6c..f4e773cb997fe875fcfb7e1c2a2a092738fde430 100644 (file)
@@ -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"