Merge tag 'debian/0.14-1' into buster-bpo

mailscripts release 0.14-1 for unstable (sid) [dgit]

[dgit distro=debian no-split --quilt=linear]

# gpg: Signature made Fri 15 Nov 2019 06:20:35 PM MST
# gpg:                using RSA key 9B917007AE030E36E4FC248B695B7AE4BF066240
# gpg: Good signature from "Sean Whitton <spwhitton@spwhitton.name>" [ultimate]
# Primary key fingerprint: 8DC2 487E 51AB DD90 B5C4  753F 0F56 D055 3B6D 411B
#      Subkey fingerprint: 9B91 7007 AE03 0E36 E4FC  248B 695B 7AE4 BF06 6240

1 files changed, 21 insertions, 10 deletions

diff --git a/notmuch-extract-patch.1.pod b/notmuch-extract-patch.1.pod
index 21095bc..a18cc22 100644
--- a/notmuch-extract-patch.1.pod
+++ b/notmuch-extract-patch.1.pod
@@ -4,7 +4,7 @@ notmuch-extract-patch - extract a git patch series from notmuch
 
 =head1 SYNOPSIS
 
-B<notmuch-extract-patch> I<QUERY>
+B<notmuch-extract-patch> [B<-v>|B<--reroll-count=>I<N>] I<QUERY>
 
 =head1 DESCRIPTION
 
@@ -15,7 +15,23 @@ replies/reviews.
 
 =head1 OPTIONS
 
-None.
+=over 4
+
+=item B<-v>|B<--reroll-count=>I<N>
+
+Try to extract the I<N>th version of a patch series, where these
+patches are identified by subject prefixes like "[PATCH vI<N> 1/3]".
+
+If this option is not specified, default to extracting the first
+version of the patch series.
+
+Note that this option should not usually be needed, because best
+practices when sharing patches with git-send-email(1) include starting
+a new thread when posting a revised series.  The I<--in-reply-to>
+option to git-format-patch(1) is used mainly for posting a patch
+series in reply to a bug report.
+
+=back
 
 =head1 EXAMPLE
 
@@ -28,17 +44,12 @@ None.
 
 =head1 LIMITATIONS
 
-B<notmuch-extract-patch> assumes one patch series per query.  So if
-there is more than one patch series in a thread, you will need to
+B<notmuch-extract-patch> can select patches to extract based on the
+reroll count, but otherwise assumes that there is only one patch
+series in a thread.  If this assumption is violated, you would need to
 construct a notmuch query that includes only the patches you want to
 extract, which somewhat defeats the purpose of this script.
 
-This should not happen often because best practices when sharing
-patches with git-send-email(1) include starting a new thread when
-posting a revised series.  The I<--in-reply-to> option to
-B<notmuch-extract-patch> is used mainly for posting a patch series in
-reply to a bug report.
-
 =head1 SEE ALSO
 
 notmuch(1), git-send-email(1)