* [PATCH 3/9] add missing long options to 'git mergetool' completion
@ 2009-08-08 8:56 Emmanuel Trillaud
0 siblings, 0 replies; only message in thread
From: Emmanuel Trillaud @ 2009-08-08 8:56 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: git
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2009-08-08 8:56 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-08-08 8:56 [PATCH 3/9] add missing long options to 'git mergetool' completion Emmanuel Trillaud
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox