From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: [PATCH 1/5] Documentation: describe the format of messages with inline patches Date: Fri, 15 Apr 2011 13:24:38 -0700 Message-ID: <7vbp07clfd.fsf@alter.siamese.dyndns.org> References: <87d3kq6tz7.fsf@rho.meyering.net> <1302719749.21047.6.camel@drew-northup.unet.maine.edu> <87mxjtn8x7.fsf@rho.meyering.net> <20110413221736.GA773@elie> <7vzkntkc9d.fsf@alter.siamese.dyndns.org> <20110414211125.GA15277@elie> <7vlizcfpz8.fsf@alter.siamese.dyndns.org> <20110415021100.GA19829@elie> <20110415022202.GB19829@elie> <1302898291.5926.9.camel@drew-northup.unet.maine.edu> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Jonathan Nieder , Jim Meyering , git list , Yann Dirson , Stephen Boyd To: Drew Northup X-From: git-owner@vger.kernel.org Fri Apr 15 22:25:02 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QApZe-0005jI-4I for gcvg-git-2@lo.gmane.org; Fri, 15 Apr 2011 22:25:02 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754715Ab1DOUY5 (ORCPT ); Fri, 15 Apr 2011 16:24:57 -0400 Received: from a-pb-sasl-sd.pobox.com ([64.74.157.62]:58293 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750922Ab1DOUY4 (ORCPT ); Fri, 15 Apr 2011 16:24:56 -0400 Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by a-pb-sasl-sd.pobox.com (Postfix) with ESMTP id D04164789; Fri, 15 Apr 2011 16:26:53 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=5B0NH+WRWjuvQ/7XPsyhIVswKMI=; b=taj01B 0Hgje0g/1PbNVImX69tHbp6zPRLJg4SXpGtwMlZ8FBwrmDKBoHldXVcwpQ/qMooB 7fGE+JKk2tvIyZgLgdL6nc+R5iDG9TbSZv29i8TBy4HFHqkr6uv9qu/vBsjfUGB7 DJsFPDUTYSzYNi7lgKneLxc3M4NvFSsmszBl8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=dN4tO/KidCcDzp1pYCOQYpoL9Sb60UL3 7ARCwwQ9XVF4Q6pX8nAH71x7EHT8/5HUVG8nPLhqcUmtEh3k8kzCgh1N2qo+IU9F UcyFYQejOoHksu7PHIjhE66MaqvSyX9RPfoOQC48GOX0s1KfN9eLE7Vg2VuzcO/m A6bflrsiwlM= Received: from a-pb-sasl-sd.pobox.com (unknown [127.0.0.1]) by a-pb-sasl-sd.pobox.com (Postfix) with ESMTP id 6FBFB4782; Fri, 15 Apr 2011 16:26:46 -0400 (EDT) Received: from pobox.com (unknown [76.102.170.102]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by a-pb-sasl-sd.pobox.com (Postfix) with ESMTPSA id A8C284773; Fri, 15 Apr 2011 16:26:38 -0400 (EDT) In-Reply-To: <1302898291.5926.9.camel@drew-northup.unet.maine.edu> (Drew Northup's message of "Fri, 15 Apr 2011 16:11:31 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) X-Pobox-Relay-ID: AF3FE322-679E-11E0-87D1-E8AB60295C12-77302942!a-pb-sasl-sd.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Drew Northup writes: > Maybe I'm too picky, but I'd feel more comfortable saying: > > ... > dashes, and then sent as a message which in our example stars with > "arch/arm config files were..." On the receiving end, readers can save > ... Surely you are ;-) I am tempted to squash the following into it. Thanks. Documentation/git-format-patch.txt | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index c20e0ed..eebfa5c 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -255,9 +255,9 @@ Do the same for ia64 so we can have sleek & trim looking Typically it will be placed in a MUA's drafts folder, edited to add timely commentary that should not go in the changelog after the three -dashes, and then sent as a message whose body starts with "arch/arm -config files were". On the receiving end, readers can save -interesting patches in a UNIX mailbox and apply them with +dashes, and then sent as a message whose body, in our example, starts +with "arch/arm config files were...". On the receiving end, readers +can save interesting patches in a UNIX mailbox and apply them with linkgit:git-am[1]. When a patch is part of an ongoing discussion, the patch generated by