Return-Path: <five9a2@gmail.com>
X-Original-To: notmuch@notmuchmail.org
Delivered-To: notmuch@notmuchmail.org
Received: from localhost (localhost [127.0.0.1])
	by olra.theworths.org (Postfix) with ESMTP id 1EE25431FBC
	for <notmuch@notmuchmail.org>; Sat, 28 Nov 2009 09:55:52 -0800 (PST)
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
Received: from olra.theworths.org ([127.0.0.1])
	by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id wspxF8uz8dti for <notmuch@notmuchmail.org>;
	Sat, 28 Nov 2009 09:55:51 -0800 (PST)
Received: from mail-bw0-f224.google.com (mail-bw0-f224.google.com
	[209.85.218.224])
	by olra.theworths.org (Postfix) with ESMTP id EC49D431FAE
	for <notmuch@notmuchmail.org>; Sat, 28 Nov 2009 09:55:50 -0800 (PST)
Received: by bwz24 with SMTP id 24so1747592bwz.30
	for <notmuch@notmuchmail.org>; Sat, 28 Nov 2009 09:55:50 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:received:received:sender:from:to:cc:subject
	:date:message-id:x-mailer:in-reply-to:references;
	bh=d8L3YjhC7AtRzec4BgsrujqO0SSwFUWd200xOGPEO8Q=;
	b=ll3kJ5b+Fx+2h8j9Zg18iyg1DxK87fLjtI6DgO9esxiamMMaCt4LgyyssqgwWRQ+45
	JgRKQvFTHeYla4OUpeBGFyjsyU0OjpHz7z7SaZ6llEwFRzCJVg9b61Ei2nSznqLT7FkY
	8VDoCP5+9RTSZnt+Or/PijBo6f5W97YzOobCA=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to
	:references;
	b=XyNEZ4jDomS4A33BHpJaiKl4+xmI54bP/FJNiedMyt5PQKDnJKW/OSoSSlG4ggF+tA
	dVHQlIoZD/s3uywVjyxrCbx0R6ADJ+iDkZCMQNghN0ZqHCoQ6vAS/3VvzO5AvoQKfarS
	aQTy75BvP0DyZBny1kSR5hRvCKdOkAx+FguUQ=
Received: by 10.204.24.69 with SMTP id u5mr2522410bkb.1.1259430949944;
	Sat, 28 Nov 2009 09:55:49 -0800 (PST)
Received: from localhost.localdomain (vawpc43.ethz.ch [129.132.59.11])
	by mx.google.com with ESMTPS id 13sm898047fxm.13.2009.11.28.09.55.48
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Sat, 28 Nov 2009 09:55:49 -0800 (PST)
Sender: Jed Brown <five9a2@gmail.com>
From: Jed Brown <jed@59A2.org>
To: cworth@cworth.org
Date: Sat, 28 Nov 2009 18:56:15 +0100
Message-Id: <1259430975-16459-1-git-send-email-jed@59A2.org>
X-Mailer: git-send-email 1.6.5.3
In-Reply-To: <87ljhrbgzy.fsf@yoom.home.cworth.org>
References: <87ljhrbgzy.fsf@yoom.home.cworth.org>
Cc: notmuch@notmuchmail.org
Subject: [notmuch] [PATCH] Documentation for notmuch reply
	--format=(default|headers-only)
X-BeenThere: notmuch@notmuchmail.org
X-Mailman-Version: 2.1.12
Precedence: list
List-Id: "Use and development of the notmuch mail system."
	<notmuch.notmuchmail.org>
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Nov 2009 17:55:52 -0000

Signed-off-by: Jed Brown <jed@59A2.org>
---
 notmuch.1 |   22 +++++++++++++++++++---
 notmuch.c |   16 ++++++++++++++--
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/notmuch.1 b/notmuch.1
index 2be77f9..04bd0cf 100644
--- a/notmuch.1
+++ b/notmuch.1
@@ -211,9 +211,9 @@ section below for details of the supported syntax for <search-terms>.
 The
 .B reply
 command is useful for preparing a template for an email reply.
-
-.TP
-.BR reply " <search-term>..."
+.RS 4
+.TP 4
+.BR reply " [options...] <search-term>..."
 
 Constructs a reply template for a set of messages.
 
@@ -236,6 +236,21 @@ each line with '> ' and included in the body.
 
 The resulting message template is output to stdout.
 
+Supported options for
+.B reply
+include
+.RS
+.TP 4
+.BR \-\-format= ( default | headers\-only )
+.RS
+.TP 4
+.BR default
+Includes subject and quoted message body.
+.TP
+.BR headers-only
+Only produces In-Reply-To, References, To, Cc, and Bcc headers.
+.RE
+
 See the
 .B "SEARCH SYNTAX"
 section below for details of the supported syntax for <search-terms>.
@@ -248,6 +263,7 @@ once. For example, when a series of patches are sent in a single
 thread, replying to the entire thread allows for the reply to comment
 on issue found in multiple patches.
 .RE
+.RE
 
 The
 .B tag
diff --git a/notmuch.c b/notmuch.c
index 5b0284c..d9846ce 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -204,7 +204,7 @@ command_t commands[] = {
       "\t\tSee \"notmuch help search-terms\" for details of the search\n"
       "\t\tterms syntax." },
     { "reply", notmuch_reply_command,
-      "<search-terms> [...]",
+      "[options...] <search-terms> [...]",
       "\t\tConstruct a reply template for a set of messages.",
       "\t\tConstructs a new message as a reply to a set of existing\n"
       "\t\tmessages. The Reply-To: header (if any, otherwise From:) is\n"
@@ -213,10 +213,22 @@ command_t commands[] = {
       "\n"
       "\t\tA suitable subject is constructed. The In-Reply-to: and\n"
       "\t\tReferences: headers are set appropriately, and the content\n"
-      "\t\tof the original messages is quoted and included in the body.\n"
+      "\t\tof the original messages is quoted and included in the body\n"
+      "\t\t(unless --format=headers-only is given).\n"
       "\n"
       "\t\tThe resulting message template is output to stdout.\n"
       "\n"
+      "\t\tSupported options for reply include:\n"
+      "\n"
+      "\t\t--format=(default|headers-only)\n"
+      "\n"
+      "\t\t\tdefault:\n"
+      "\t\t\t\tIncludes subject and quoted message body.\n"
+      "\n"
+      "\t\t\theaders-only:\n"
+      "\t\t\t\tOnly produces In-Reply-To, References, To\n"
+      "\t\t\t\tCc, and Bcc headers.\n"
+      "\n"
       "\t\tSee \"notmuch help search-terms\" for details of the search\n"
       "\t\tterms syntax." },
     { "tag", notmuch_tag_command,
-- 
1.6.5.3