"\t\t\tVerbose operation. Shows paths of message files as\n"
"\t\t\tthey are being indexed.\n"
"\n"
- "\t\tNote: \"notmuch new\" runs (other than the first run) will\n"
- "\t\tskip any read-only directories, so you can use that to mark\n"
- "\t\tdirectories that will not receive any new mail (and make\n"
- "\t\t\"notmuch new\" even faster).\n"
- "\n"
"\t\tInvoking notmuch with no command argument will run new if\n"
"\t\tthe setup command has previously been completed, but new has\n"
"\t\tnot previously been run." },
"\t\t(all replies to a particular message appear immediately\n"
"\t\tafter that message in date order).\n"
"\n"
+ "\t\tSupported options for show include:\n"
+ "\n"
+ "\t\t--entire-thread\n"
+ "\n"
+ "\t\t\tBy default only those messages that match the\n"
+ "\t\t\tsearch terms will be displayed. With this option,\n"
+ "\t\t\tall messages in the same thread as any matched\n"
+ "\t\t\tmessage will be displayed.\n"
+ "\n"
"\t\tThe output format is plain-text, with all text-content\n"
"\t\tMIME parts decoded. Various components in the output,\n"
"\t\t('message', 'header', 'body', 'attachment', and MIME 'part')\n"
"\t\tSee \"notmuch help search-terms\" for details of the search\n"
"\t\tterms syntax." },
{ "reply", notmuch_reply_command,
- "<search-terms> [...]",
+ "[options...] <search-terms> [...]",
"\t\tConstruct a reply template for a set of messages.",
"\t\tConstructs a new message as a reply to a set of existing\n"
"\t\tmessages. The Reply-To: header (if any, otherwise From:) is\n"
"\n"
"\t\tA suitable subject is constructed. The In-Reply-to: and\n"
"\t\tReferences: headers are set appropriately, and the content\n"
- "\t\tof the original messages is quoted and included in the body.\n"
+ "\t\tof the original messages is quoted and included in the body\n"
+ "\t\t(unless --format=headers-only is given).\n"
"\n"
"\t\tThe resulting message template is output to stdout.\n"
"\n"
+ "\t\tSupported options for reply include:\n"
+ "\n"
+ "\t\t--format=(default|headers-only)\n"
+ "\n"
+ "\t\t\tdefault:\n"
+ "\t\t\t\tIncludes subject and quoted message body.\n"
+ "\n"
+ "\t\t\theaders-only:\n"
+ "\t\t\t\tOnly produces In-Reply-To, References, To\n"
+ "\t\t\t\tCc, and Bcc headers.\n"
+ "\n"
"\t\tSee \"notmuch help search-terms\" for details of the search\n"
"\t\tterms syntax." },
{ "tag", notmuch_tag_command,
"\t\t\"notmuch restore\" command provides you a way to import\n"
"\t\tall of your tags (or labels as sup calls them)." },
{ "search-tags", notmuch_search_tags_command,
- NULL,
- "List all tags found in the database.",
- "\t\tThis command returns an alphabetically sorted list of all tags\n"
- "\t\tthat are present in the database. In other words, the resulting\n"
- "\t\tlist is a collection of all tags from all messages." },
+ "[<search-terms> [...] ]",
+ "\t\tList all tags found in the database or matching messages.",
+ "\t\tRun this command without any search-term(s) to obtain a list\n"
+ "\t\tof all tags found in the database. If you provide one or more\n"
+ "\t\tsearch-terms as argument(s) then the resulting list will\n"
+ "\t\tcontain tags only from messages that match the search-term(s).\n"
+ "\n"
+ "\t\tIn both cases the list will be alphabetically sorted." },
{ "help", notmuch_help_command,
"[<command>]",
"\t\tThis message, or more detailed help for the named command.",