{"thread":{"id":"20474","subject":"[PATCH 3/9] add missing long options to 'git mergetool' completion","startedAt":"2009-08-08T08:56:09Z","lastAt":"2009-08-08T08:56:09Z","messageCount":1,"participants":["Emmanuel Trillaud"],"isPatch":true,"patchVersion":1,"patchTotal":9},"messages":[{"id":"119975","messageId":"9f50533b0908080156ndd368cfxafbe6efeb341b8b2@mail.gmail.com","threadId":"20474","inReplyTo":null,"subject":"[PATCH 3/9] add missing long options to 'git mergetool' completion","fromName":"Emmanuel Trillaud","fromEmail":"etrillaud@gmail.com","sentAt":"2009-08-08T08:56:09Z","receivedAt":"2009-08-08T08:56:09Z","isPatch":true,"sender":{"key":"etrillaud@gmail.com","avatar":null},"body":"according to the git-mergetool man page, '--no-prompt' and '--prompt' are\nmissing from the 'git mergetool' completion\n\nSigned-off-by: Emmanuel Trillaud <etrillaud@gmail.com>\n---\n contrib/completion/git-completion.bash |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash\nb/contrib/completion/git-completion.bash\nindex 9e86d28..f56733b 100755\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1232,7 +1232,7 @@ _git_mergetool ()\n \t\treturn\n \t\t;;\n \t--*)\n-\t\t__gitcomp \"--tool=\"\n+\t\t__gitcomp \"--tool= --no-prompt --prompt\"\n \t\treturn\n \t\t;;\n \tesac\n-- \n1.6.4\n"}]}