"\t\t(oldest-first) or reverse chronological order\n"
"\t\t(newest-first), which is the default.\n"
"\n"
+ "\t--offset=[-]N\n"
+ "\n"
+ "\t\tSkip displaying the first N results. With the leading '-',\n"
+ "\t\tstart at the Nth result from the end.\n"
+ "\n"
+ "\t--limit=N\n"
+ "\n"
+ "\t\tLimit the number of displayed results to N.\n"
+ "\n"
"\tSee \"notmuch help search-terms\" for details of the search\n"
"\tterms syntax." },
{ "show", notmuch_show_command,
"\tSee \"notmuch help search-terms\" for details of the search\n"
"\tterms syntax." },
{ "count", notmuch_count_command,
- "<search-terms> [...]",
+ "[options...] <search-terms> [...]",
"Count messages matching the search terms.",
- "\tThe number of matching messages is output to stdout.\n"
+ "\tThe number of matching messages (or threads) is output to stdout.\n"
+ "\n"
+ "\tWith no search terms, a count of all messages (or threads) in\n"
+ "\tthe database will be displayed.\n"
+ "\n"
+ "\tSupported options for count include:\n"
+ "\n"
+ "\t--output=(messages|threads)\n"
+ "\n"
+ "\t\tmessages (default)\n"
+ "\n"
+ "\t\tOutput the number of matching messages.\n"
+ "\n"
+ "\t\tthreads\n"
"\n"
- "\tWith no search terms, a count of all messages in the database\n"
- "\twill be displayed.\n"
+ "\t\tOutput the number of matching threads.\n"
"\n"
"\tSee \"notmuch help search-terms\" for details of the search\n"
"\tterms syntax." },
"\tSee \"notmuch help search-terms\" for the search-term syntax.\n"
},
{ "restore", notmuch_restore_command,
- "<filename>",
+ "[--accumulate] [<filename>]",
"Restore the tags from the given dump file (see 'dump').",
+ "\tInput is read from the given filename, if any, or from stdin.\n"
"\tNote: The dump file format is specifically chosen to be\n"
"\tcompatible with the format of files produced by sup-dump.\n"
"\tSo if you've previously been using sup for mail, then the\n"
"\t\"notmuch restore\" command provides you a way to import\n"
- "\tall of your tags (or labels as sup calls them)." },
+ "\tall of your tags (or labels as sup calls them).\n"
+ "\tThe --accumulate switch causes the union of the existing and new\n"
+ "\ttags to be applied, instead of replacing each message's tags as\n"
+ "\tthey are read in from the dump file."},
{ "config", notmuch_config_command,
"[get|set] <section>.<item> [value ...]",
"Get or set settings in the notmuch configuration file.",