according to the git-mergetool man page, '--no-prompt' and '--prompt' are missing from the 'git mergetool' completion
Signed-off-by: Emmanuel Trillaud <etrillaud@gmail.com> --- contrib/completion/git-completion.bash | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Show changes to contrib/completion/git-completion.bash +1 −1
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 9e86d28..f56733b 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1232,7 +1232,7 @@ _git_mergetool () return ;; --*) - __gitcomp "--tool=" + __gitcomp "--tool= --no-prompt --prompt" return ;; esac
-- 1.6.4