Return-Path: 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 89FF7431FBF for ; Wed, 10 Feb 2010 15:36:49 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -1.036 X-Spam-Level: X-Spam-Status: No, score=-1.036 tagged_above=-999 required=5 tests=[AWL=-1.037, BAYES_50=0.001] autolearn=unavailable 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 Mmdq0j9y7WgG for ; Wed, 10 Feb 2010 15:36:48 -0800 (PST) Received: from max.feld.cvut.cz (max.feld.cvut.cz [147.32.192.36]) by olra.theworths.org (Postfix) with ESMTP id A491D431FAE for ; Wed, 10 Feb 2010 15:36:48 -0800 (PST) Received: from localhost (unknown [192.168.200.4]) by max.feld.cvut.cz (Postfix) with ESMTP id A3D6819F33A6; Thu, 11 Feb 2010 00:36:47 +0100 (CET) X-Virus-Scanned: IMAP AMAVIS Received: from max.feld.cvut.cz ([192.168.200.1]) by localhost (styx.feld.cvut.cz [192.168.200.4]) (amavisd-new, port 10044) with ESMTP id uJACKj7dGR0A; Thu, 11 Feb 2010 00:36:43 +0100 (CET) Received: from imap.feld.cvut.cz (imap.feld.cvut.cz [147.32.192.34]) by max.feld.cvut.cz (Postfix) with ESMTP id 75A7E19F33A1; Thu, 11 Feb 2010 00:36:43 +0100 (CET) Received: from steelpick.localdomain (k335-30.felk.cvut.cz [147.32.86.30]) (Authenticated sender: sojkam1) by imap.feld.cvut.cz (Postfix) with ESMTPSA id 2599F15C052; Thu, 11 Feb 2010 00:36:42 +0100 (CET) Received: from wsh by steelpick.localdomain with local (Exim 4.71) (envelope-from ) id 1NfM6s-0001qi-S4; Thu, 11 Feb 2010 00:36:42 +0100 From: Michal Sojka To: Carl Worth , notmuch@notmuchmail.org In-Reply-To: <877hqk4xr7.fsf@yoom.home.cworth.org> References: <87vde4derz.fsf@yoom.home.cworth.org> <877hqk4xr7.fsf@yoom.home.cworth.org> Date: Thu, 11 Feb 2010 00:36:42 +0100 Message-ID: <87r5oszmr9.fsf@steelpick.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: Re: [notmuch] emacs: On getting support for inline images X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Feb 2010 23:36:49 -0000 On Wed, 10 Feb 2010 12:54:52 -0800, Carl Worth wrote: > PS. I know that attaching the output of "git format-patch" to a message > like this isn't the "git way". (That is, you won't get the right result > by simply piping this message to "git am".) But I really wish it > were. It seems I often write code in response to an email message and I > often want to reply to that *message* and incidentally provide a > patch. The git way, with the commit message in the subject and the first > part of the body seems backwards to me, (as far as the conversation is > concerned). Hi Carl, this is what scissors line was designed for. At least according to git-mailinfo(1). "git am -c" should take it into account as well. I wanted to test this with my previous patch I sent this way, but I get fatal: corrupt patch at line 27. So I do not know whether it really works. > PPS. If I did want to construct this message in the "git way", but > without using git-send-mail, I know how to construct the subject line > and how to put explanatory text like this below the separator. But what > am I supposed to do with the commit identifier that appears in an mbox > "From" line in the format-patch output? I assume this is required for > "git am -3" to work, but where can I put it in an email message? I'm not sure whether From line is used for 3 way merge. It seems that mails produced by git send-email do not contain it. I think that the index lines just after diff --git could be sufficient for 3 way merge. Is it correct? Michal