1 Return-Path: <sojkam1@fel.cvut.cz>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 89FF7431FBF
\r
6 for <notmuch@notmuchmail.org>; Wed, 10 Feb 2010 15:36:49 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-1.036 tagged_above=-999 required=5
\r
12 tests=[AWL=-1.037, BAYES_50=0.001] autolearn=unavailable
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id Mmdq0j9y7WgG for <notmuch@notmuchmail.org>;
\r
16 Wed, 10 Feb 2010 15:36:48 -0800 (PST)
\r
17 Received: from max.feld.cvut.cz (max.feld.cvut.cz [147.32.192.36])
\r
18 by olra.theworths.org (Postfix) with ESMTP id A491D431FAE
\r
19 for <notmuch@notmuchmail.org>; Wed, 10 Feb 2010 15:36:48 -0800 (PST)
\r
20 Received: from localhost (unknown [192.168.200.4])
\r
21 by max.feld.cvut.cz (Postfix) with ESMTP id A3D6819F33A6;
\r
22 Thu, 11 Feb 2010 00:36:47 +0100 (CET)
\r
23 X-Virus-Scanned: IMAP AMAVIS
\r
24 Received: from max.feld.cvut.cz ([192.168.200.1])
\r
25 by localhost (styx.feld.cvut.cz [192.168.200.4]) (amavisd-new,
\r
27 with ESMTP id uJACKj7dGR0A; Thu, 11 Feb 2010 00:36:43 +0100 (CET)
\r
28 Received: from imap.feld.cvut.cz (imap.feld.cvut.cz [147.32.192.34])
\r
29 by max.feld.cvut.cz (Postfix) with ESMTP id 75A7E19F33A1;
\r
30 Thu, 11 Feb 2010 00:36:43 +0100 (CET)
\r
31 Received: from steelpick.localdomain (k335-30.felk.cvut.cz [147.32.86.30])
\r
32 (Authenticated sender: sojkam1)
\r
33 by imap.feld.cvut.cz (Postfix) with ESMTPSA id 2599F15C052;
\r
34 Thu, 11 Feb 2010 00:36:42 +0100 (CET)
\r
35 Received: from wsh by steelpick.localdomain with local (Exim 4.71)
\r
36 (envelope-from <sojkam1@fel.cvut.cz>)
\r
37 id 1NfM6s-0001qi-S4; Thu, 11 Feb 2010 00:36:42 +0100
\r
38 From: Michal Sojka <sojkam1@fel.cvut.cz>
\r
39 To: Carl Worth <cworth@cworth.org>, notmuch@notmuchmail.org
\r
40 In-Reply-To: <877hqk4xr7.fsf@yoom.home.cworth.org>
\r
41 References: <87vde4derz.fsf@yoom.home.cworth.org>
\r
42 <877hqk4xr7.fsf@yoom.home.cworth.org>
\r
43 Date: Thu, 11 Feb 2010 00:36:42 +0100
\r
44 Message-ID: <87r5oszmr9.fsf@steelpick.localdomain>
\r
46 Content-Type: text/plain; charset=us-ascii
\r
47 Subject: Re: [notmuch] emacs: On getting support for inline images
\r
48 X-BeenThere: notmuch@notmuchmail.org
\r
49 X-Mailman-Version: 2.1.13
\r
51 List-Id: "Use and development of the notmuch mail system."
\r
52 <notmuch.notmuchmail.org>
\r
53 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
54 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
55 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
56 List-Post: <mailto:notmuch@notmuchmail.org>
\r
57 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
58 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
59 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
60 X-List-Received-Date: Wed, 10 Feb 2010 23:36:49 -0000
\r
62 On Wed, 10 Feb 2010 12:54:52 -0800, Carl Worth <cworth@cworth.org> wrote:
\r
63 > PS. I know that attaching the output of "git format-patch" to a message
\r
64 > like this isn't the "git way". (That is, you won't get the right result
\r
65 > by simply piping this message to "git am".) But I really wish it
\r
66 > were. It seems I often write code in response to an email message and I
\r
67 > often want to reply to that *message* and incidentally provide a
\r
68 > patch. The git way, with the commit message in the subject and the first
\r
69 > part of the body seems backwards to me, (as far as the conversation is
\r
74 this is what scissors line was designed for. At least according to
\r
75 git-mailinfo(1). "git am -c" should take it into account as well.
\r
77 I wanted to test this with my previous patch I sent this way, but I get
\r
78 fatal: corrupt patch at line 27. So I do not know whether it really works.
\r
80 > PPS. If I did want to construct this message in the "git way", but
\r
81 > without using git-send-mail, I know how to construct the subject line
\r
82 > and how to put explanatory text like this below the separator. But what
\r
83 > am I supposed to do with the commit identifier that appears in an mbox
\r
84 > "From" line in the format-patch output? I assume this is required for
\r
85 > "git am -3" to work, but where can I put it in an email message?
\r
87 I'm not sure whether From line is used for 3 way merge. It seems that
\r
88 mails produced by git send-email do not contain it. I think that the
\r
89 index lines just after diff --git could be sufficient for 3 way merge.
\r