From d1b7a2e2e78bae233734593778232a802da7930e Mon Sep 17 00:00:00 2001 From: may Date: Tue, 4 Jul 2023 04:51:26 +0200 Subject: [PATCH] add stash completions to git show and git diff (cherry picked from commit e3e7ab77ade306db8449fa0467891c3d4b1b9a52) --- share/completions/git.fish | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/completions/git.fish b/share/completions/git.fish index ad4251600..0a66248eb 100644 --- a/share/completions/git.fish +++ b/share/completions/git.fish @@ -1042,6 +1042,7 @@ complete -f -c git -n __fish_git_needs_command -a show -d 'Show the last commit complete -f -c git -n '__fish_git_using_command show' -n 'not contains -- -- (commandline -opc)' -ka '(__fish_git_branches)' complete -f -c git -n '__fish_git_using_command show' -n 'not contains -- -- (commandline -opc)' -ka '(__fish_git_tags)' -d Tag complete -f -c git -n '__fish_git_using_command show' -n 'not contains -- -- (commandline -opc)' -ka '(__fish_git_commits)' +complete -f -c git -n '__fish_git_using_command show' -n 'not contains -- -- (commandline -opc)' -ka '(__fish_git_complete_stashes)' complete -f -c git -n __fish_git_needs_rev_files -n 'not contains -- -- (commandline -opc)' -xa '(__fish_git_complete_rev_files)' complete -F -c git -n '__fish_git_using_command show' -n 'contains -- -- (commandline -opc)' complete -f -c git -n '__fish_git_using_command show' -l format -d 'Pretty-print the contents of the commit logs in a given format' -a '(__fish_git_show_opt format)' @@ -1371,6 +1372,7 @@ complete -f -c git -n '__fish_git_using_command describe' -l first-parent -d 'Fo ### diff complete -c git -n __fish_git_needs_command -a diff -d 'Show changes between commits and working tree' complete -c git -n '__fish_git_using_command diff' -n 'not contains -- -- (commandline -opc)' -ka '(__fish_git_ranges)' +complete -c git -n '__fish_git_using_command diff' -n 'not contains -- -- (commandline -opc)' -ka '(__fish_git_complete_stashes)' complete -c git -n '__fish_git_using_command diff' -l cached -d 'Show diff of changes in the index' complete -c git -n '__fish_git_using_command diff' -l staged -d 'Show diff of changes in the index' complete -c git -n '__fish_git_using_command diff' -l no-index -d 'Compare two paths on the filesystem'