From f3c864a9e2814e809529df12a207ba30c791037e Mon Sep 17 00:00:00 2001 From: Fabian Homborg Date: Tue, 6 Mar 2018 22:04:35 +0100 Subject: [PATCH] [git completions] Offer unmerged files for `add` These occur e.g. when resolving a conflict, which then needs `git add`. --- share/completions/git.fish | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/completions/git.fish b/share/completions/git.fish index 0265ac794..12ae68ba8 100644 --- a/share/completions/git.fish +++ b/share/completions/git.fish @@ -449,7 +449,7 @@ complete -c git -n '__fish_git_using_command add' -l ignore-errors -d 'Ignore er complete -c git -n '__fish_git_using_command add' -l ignore-missing -d 'Check if any of the given files would be ignored' # Renames also show up as untracked + deleted, and to get git to show it as a rename _both_ need to be added. # However, we can't do that as it is two tokens, so we don't need renamed here. -complete -f -c git -n '__fish_git_using_command add' -a '(__fish_git_files modified untracked deleted)' +complete -f -c git -n '__fish_git_using_command add' -a '(__fish_git_files modified untracked deleted unmerged)' # TODO options ### checkout