aboutsummaryrefslogtreecommitdiffhomepage
path: root/notmuch.1
diff options
context:
space:
mode:
authorGravatar David Bremner <bremner@debian.org>2011-10-21 19:09:49 -0300
committerGravatar David Bremner <bremner@debian.org>2011-10-23 10:27:57 -0300
commit3ae8ac6ace7c05ba066aba54a92054eb4232a99d (patch)
treee7d82555c11abcdca536f92d6230286e57f68f5e /notmuch.1
parent903fe6398693621484315d30bd8d37de4095f4a5 (diff)
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.
Diffstat (limited to 'notmuch.1')
-rw-r--r--notmuch.16
1 files changed, 5 insertions, 1 deletions
diff --git a/notmuch.1 b/notmuch.1
index 4f864a89..bba479e1 100644
--- a/notmuch.1
+++ b/notmuch.1
@@ -480,7 +480,7 @@ section below for details of the supported syntax for <search-terms>.
.RE
.TP
-.BR restore " <filename>"
+.BR restore " [--accumulate] [<filename>]"
Restores the tags from the given file (see
.BR "notmuch dump" ")."
@@ -493,6 +493,10 @@ So if you've previously been using sup for mail, then the
.B "notmuch restore"
command provides you a way to import all of your tags (or labels as
sup calls them).
+
+The --accumulate switch causes the union of the existing and new tags to be
+applied, instead of replacing each message's tags as they are read in from the
+dump file.
.RE
The