From 5bd1c5ecbf7ed711e4708b3af89bc8e99e44988a Mon Sep 17 00:00:00 2001 From: Fabian Boehm Date: Thu, 23 May 2024 15:08:55 +0200 Subject: [PATCH] completions/git: Move unmerged to `git restore --staged` I still don't get how exactly restore works. Fixes #10518 --- share/completions/git.fish | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/completions/git.fish b/share/completions/git.fish index 6f47c42df..ff0fd8019 100644 --- a/share/completions/git.fish +++ b/share/completions/git.fish @@ -1992,8 +1992,8 @@ complete -f -c git -n '__fish_git_using_command restore' -l ignore-unmerged -d ' complete -f -c git -n '__fish_git_using_command restore' -l ignore-skip-worktree-bits -d 'Ignore the sparse-checkout file and unconditionally restore any files in ' complete -f -c git -n '__fish_git_using_command restore' -l overlay -d 'Never remove files when restoring' complete -f -c git -n '__fish_git_using_command restore' -l no-overlay -d 'Remove files when restoring (default)' -complete -f -c git -n '__fish_git_using_command restore' -n 'not __fish_git_contains_opt -s S staged' -a '(__fish_git_files modified deleted modified-staged-deleted unmerged)' -complete -f -c git -n '__fish_git_using_command restore' -n '__fish_git_contains_opt -s S staged' -a '(__fish_git_files added modified-staged deleted-staged renamed copied)' +complete -f -c git -n '__fish_git_using_command restore' -n 'not __fish_git_contains_opt -s S staged' -a '(__fish_git_files modified deleted modified-staged-deleted)' +complete -f -c git -n '__fish_git_using_command restore' -n '__fish_git_contains_opt -s S staged' -a '(__fish_git_files added modified-staged deleted-staged renamed copied unmerged)' complete -F -c git -n '__fish_git_using_command restore' -n '__fish_git_contains_opt -s s source' # switch options complete -f -c git -n __fish_git_needs_command -a switch -d 'Switch to a branch'