1 Return-Path: <wking@tremily.us>
\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 96881431FC0
\r
6 for <notmuch@notmuchmail.org>; Tue, 8 Apr 2014 08:58:07 -0700 (PDT)
\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
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001]
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id cLPNPetPljsP for <notmuch@notmuchmail.org>;
\r
17 Tue, 8 Apr 2014 08:58:00 -0700 (PDT)
\r
18 Received: from qmta01.westchester.pa.mail.comcast.net
\r
19 (qmta01.westchester.pa.mail.comcast.net [76.96.62.16])
\r
20 by olra.theworths.org (Postfix) with ESMTP id 0DE77431FBC
\r
21 for <notmuch@notmuchmail.org>; Tue, 8 Apr 2014 08:57:59 -0700 (PDT)
\r
22 Received: from omta12.westchester.pa.mail.comcast.net ([76.96.62.44])
\r
23 by qmta01.westchester.pa.mail.comcast.net with comcast
\r
24 id nQNs1n0060xGWP851TxzZD; Tue, 08 Apr 2014 15:57:59 +0000
\r
25 Received: from odin.tremily.us ([24.18.63.50])
\r
26 by omta12.westchester.pa.mail.comcast.net with comcast
\r
27 id nTxx1n00b152l3L3YTxyPX; Tue, 08 Apr 2014 15:57:59 +0000
\r
28 Received: from mjolnir.tremily.us (unknown [192.168.0.140])
\r
29 by odin.tremily.us (Postfix) with ESMTPS id 3BB3D110D802;
\r
30 Tue, 8 Apr 2014 08:57:57 -0700 (PDT)
\r
31 Received: (nullmailer pid 3821 invoked by uid 1000);
\r
32 Tue, 08 Apr 2014 15:57:44 -0000
\r
33 From: "W. Trevor King" <wking@tremily.us>
\r
34 To: notmuch <notmuch@notmuchmail.org>
\r
35 Subject: [PATCH] NEWS: Document the recent 'nmbug clone' and @{upstream}
\r
37 Date: Tue, 8 Apr 2014 08:57:38 -0700
\r
39 <151b4a1b9612daa53fb47b60f0aa65f7a8e5ef5e.1396972599.git.wking@tremily.us>
\r
40 X-Mailer: git-send-email 1.9.1.353.gc66d89d
\r
41 In-Reply-To: <878urg849d.fsf@zancas.localnet>
\r
42 References: <878urg849d.fsf@zancas.localnet>
\r
43 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;
\r
44 s=q20140121; t=1396972679;
\r
45 bh=4FKvNSHLX/a5pU3rXZZnMhI+ZNAS4fj66i2kfOxeSCI=;
\r
46 h=Received:Received:Received:Received:From:To:Subject:Date:
\r
48 b=eGAnrbhjO2IfomqSFug/648x+opFe5LNDd6FweV4ogD/4hZLVGSDpoOK9rBloMWfk
\r
49 1h6ebxMwoJUPQ1Hq6utE0Hd78UKc3jdcv+ICZrPLw7Ubxk0b2T6oLjpJ8lX0j4ExE8
\r
50 3unfRV9hLFCXiaI059Q7CKpncUhIuhZt8lnJKGbW2dR0GaD1jL8O9ZLmHo0cNOidX5
\r
51 oN0QZam31MjCKHaxv7D1Zb0oNel3o+PAwEPCyVd4Kc023UA5C2Mxwshmr6d/vtqxeJ
\r
52 HZtodcsJxFSprV6kuYiu08Ut+kQm9erhL+WXnkIAsw5G1J2CgRgNXdG3OcNhiJuuhR
\r
54 X-BeenThere: notmuch@notmuchmail.org
\r
55 X-Mailman-Version: 2.1.13
\r
57 List-Id: "Use and development of the notmuch mail system."
\r
58 <notmuch.notmuchmail.org>
\r
59 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
60 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
61 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
62 List-Post: <mailto:notmuch@notmuchmail.org>
\r
63 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
64 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
65 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
66 X-List-Received-Date: Tue, 08 Apr 2014 15:58:07 -0000
\r
68 The changes just landed with c200167 (nmbug: Add 'clone' and replace
\r
69 FETCH_HEAD with @{upstream}, 2014-03-09).
\r
71 The preferred markup language for NEWS seems to be Markdown, which is
\r
72 parsed by devel/news2wiki.pl into Markdown chunks for rendering by
\r
75 [1]: http://notmuchmail.org/news/
\r
77 NEWS | 20 ++++++++++++++++++++
\r
78 1 file changed, 20 insertions(+)
\r
80 diff --git a/NEWS b/NEWS
\r
81 index d4f4ea4..e26fa0a 100644
\r
84 @@ -20,6 +20,26 @@ Bug fix for saved searches with newlines in them.
\r
85 Split lines confuse `notmuch count --batch`, so we remove embedded
\r
86 newlines before calling notmuch count.
\r
91 +nmbug adds a `clone` command for setting up the initial repository and
\r
92 +uses `@{upstream}` instead of `FETCH_HEAD` to track upstream changes.
\r
94 + The `@{upstream}` change reduces ambiguity when fetching multiple
\r
95 + branches, but requires existing users update their bare `NMBGIT`
\r
96 + repository (usually `~/.nmbug`) to a non-bare repository. The
\r
97 + easiest way to do this is:
\r
99 + 1. Push any local commits to a remote repository.
\r
100 + 2. Remove your `NMBGIT` repository (e.g. `mv .nmbug .nmbug.bak`).
\r
101 + 3. Use the new `clone` command to create a fresh clone:
\r
103 + nmbug clone nmbug@nmbug.tethera.net:nmbug-tags
\r
105 + 4. If you had local commits in step 1, add a remote for that
\r
106 + repository and fetch them into the new repository.
\r
108 Notmuch 0.17 (2013-12-30)
\r
109 =========================
\r