X-Git-Url: https://git.cworth.org/git?p=obsolete%2Fnotmuch-wiki;a=blobdiff_plain;f=manpages%2Fnotmuch-restore-1.mdwn;h=8164f92cd6c0169174b39871fbf05e756aff60e1;hp=555ae6ac0393846f5430f40c20252dd4447222f8;hb=ad04c8c6b3d8c29a905d9f5f92256fc2bd64be5e;hpb=2134d331154dfbe8d01b8db310f8d5ad7616f38d
diff --git a/manpages/notmuch-restore-1.mdwn b/manpages/notmuch-restore-1.mdwn
index 555ae6a..8164f92 100644
--- a/manpages/notmuch-restore-1.mdwn
+++ b/manpages/notmuch-restore-1.mdwn
@@ -8,7 +8,8 @@
SYNOPSIS
- notmuch restore [--accumulate] [ --input=<filename> ]
+ notmuch restore [--accumulate] [--format=(auto|batch-tag|sup)] [
+ --input=<filename> ]
DESCRIPTION
@@ -17,28 +18,53 @@
The input is read from the given filename, if any, or from stdin.
- Note: The dump file format is specifically chosen to be compatible with
- the format of files produced by sup-dump. So if you've previously been
- using sup for mail, then the notmuch restore command provides you a way
- to import all of your tags (or labels as sup calls them).
+ Supported options for restore include
- 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.
+ --accumulate
- See notmuch-search-terms(7) for details of the supported syntax for
- <search-terms>.
+ The union of the existing and new tags is applied, instead of
+ replacing each message's tags as they are read in from the dump
+ file.
- notmuch restore updates the maildir flags according to tag changes if
- the maildir.synchronize_flags configuration option is enabled. See not-
- much-config(1) for details.
+ --format=(sup|batch-tag|auto)
+
+ Notmuch restore supports two plain text dump formats, with each
+ line specifying a message-id and a set of tags. For details of
+ the actual formats, see notmuch-dump(1).
+
+ sup
+
+ The sup dump file format is specifically chosen to be com-
+ patible with the format of files produced by sup-dump. So
+ if you've previously been using sup for mail, then the not-
+ much restore command provides you a way to import all of
+ your tags (or labels as sup calls them).
+
+ batch-tag
+
+ The batch-tag dump format is intended to more robust
+ against malformed message-ids and tags containing white-
+ space or non-ascii(7) characters. See notmuch-dump(1) for
+ details on this format.
+
+ notmuch restore updates the maildir flags according to tag
+ changes if the maildir.synchronize_flags configuration
+ option is enabled. See notmuch-config(1) for details.
+
+ auto
+
+ This option (the default) tries to guess the format from
+ the input. For correctly formed input in either supported
+ format, this heuristic, based the fact that batch-tag for-
+ mat contains no parentheses, should be accurate.
SEE ALSO
- notmuch(1), notmuch-config(1), notmuch-count(1), notmuch-dump(1), not-
- much-hooks(5), notmuch-new(1), notmuch-reply(1), notmuch-search(1),
- notmuch-search-terms(7), notmuch-show(1), notmuch-tag(1)
+ notmuch(1), notmuch-config(1), notmuch-count(1), notmuch-dump(1), not-
+ much-hooks(5), notmuch-insert(1), notmuch-new(1), notmuch-reply(1),
+ notmuch-search(1), notmuch-search-terms(7), notmuch-show(1), notmuch-
+ tag(1)
-Notmuch 0.14
+Notmuch 0.16