From 3ae8ac6ace7c05ba066aba54a92054eb4232a99d Mon Sep 17 00:00:00 2001 From: David Bremner Date: Fri, 21 Oct 2011 19:09:49 -0300 Subject: docs: Update news, man page, and online help for restore --accumulate As a side effect, reformat the NEWs entry for notmuch dump for consistency with the notmuch restore NEWS submitted by Thomas Schwinge. --- notmuch.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'notmuch.c') diff --git a/notmuch.c b/notmuch.c index 4232bee7..e004c6c5 100644 --- a/notmuch.c +++ b/notmuch.c @@ -393,13 +393,17 @@ static command_t commands[] = { "\tSee \"notmuch help search-terms\" for the search-term syntax.\n" }, { "restore", notmuch_restore_command, - "", + "[--accumulate] []", "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]
. [value ...]", "Get or set settings in the notmuch configuration file.", -- cgit v1.2.3