From: Emmanuel Trillaud <etrillaud@gmail.com>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: git@vger.kernel.org
Subject: [PATCH 3/9] add missing long options to 'git mergetool' completion
Date: Sat, 8 Aug 2009 10:56:09 +0200 [thread overview]
Message-ID: <9f50533b0908080156ndd368cfxafbe6efeb341b8b2@mail.gmail.com> (raw)
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(-)
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
reply other threads:[~2009-08-08 8:56 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9f50533b0908080156ndd368cfxafbe6efeb341b8b2@mail.gmail.com \
--to=etrillaud@gmail.com \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox