1 Return-Path: <bremner@unb.ca>
\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 6DD80431FC2
\r
6 for <notmuch@notmuchmail.org>; Mon, 11 Feb 2013 10:24:28 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\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 lkiVr1FtRpJ2 for <notmuch@notmuchmail.org>;
\r
16 Mon, 11 Feb 2013 10:24:27 -0800 (PST)
\r
17 Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])
\r
18 (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 6BD07431FAE
\r
21 for <notmuch@notmuchmail.org>; Mon, 11 Feb 2013 10:24:27 -0800 (PST)
\r
22 Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net
\r
23 ([156.34.82.78] helo=zancas.localnet)
\r
24 by tesseract.cs.unb.ca with esmtpsa
\r
25 (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80)
\r
26 (envelope-from <bremner@unb.ca>)
\r
27 id 1U4LgR-0007C7-C9; Sat, 09 Feb 2013 21:26:19 -0400
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.80)
\r
29 (envelope-from <bremner@unb.ca>)
\r
30 id 1U4LgL-0005GD-O1; Sat, 09 Feb 2013 21:26:13 -0400
\r
31 From: David Bremner <david@tethera.net>
\r
32 To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org
\r
33 Subject: Re: [PATCH] nmbug: only push master branch on nmbug push
\r
34 In-Reply-To: <1360450140-8439-1-git-send-email-jani@nikula.org>
\r
35 References: <1360450140-8439-1-git-send-email-jani@nikula.org>
\r
36 User-Agent: Notmuch/0.15.1 (http://notmuchmail.org) Emacs/24.2.1
\r
37 (x86_64-pc-linux-gnu)
\r
38 Date: Sat, 09 Feb 2013 21:26:13 -0400
\r
39 Message-ID: <8762219cy2.fsf@zancas.localnet>
\r
41 Content-Type: text/plain
\r
43 Cc: Tomi Ollila <tomi.ollila@iki.fi>
\r
44 X-BeenThere: notmuch@notmuchmail.org
\r
45 X-Mailman-Version: 2.1.13
\r
47 List-Id: "Use and development of the notmuch mail system."
\r
48 <notmuch.notmuchmail.org>
\r
49 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
50 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
51 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
52 List-Post: <mailto:notmuch@notmuchmail.org>
\r
53 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
54 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
55 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
56 X-List-Received-Date: Mon, 11 Feb 2013 18:24:28 -0000
\r
58 Jani Nikula <jani@nikula.org> writes:
\r
60 > nmbug pull only merges upstream master, but nmbug push tries to push
\r
61 > all local branches. The asymmetry results in conflicts whenever there
\r
62 > have been changes in the config branch in the origin:
\r