unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: "W. Trevor King" <wking@tremily.us>
To: notmuch <notmuch@notmuchmail.org>
Subject: [PATCH] NEWS: Document the recent 'nmbug clone' and @{upstream} changes
Date: Tue,  8 Apr 2014 08:57:38 -0700	[thread overview]
Message-ID: <151b4a1b9612daa53fb47b60f0aa65f7a8e5ef5e.1396972599.git.wking@tremily.us> (raw)
In-Reply-To: <878urg849d.fsf@zancas.localnet>

The changes just landed with c200167 (nmbug: Add 'clone' and replace
FETCH_HEAD with @{upstream}, 2014-03-09).

The preferred markup language for NEWS seems to be Markdown, which is
parsed by devel/news2wiki.pl into Markdown chunks for rendering by
ikiwiki [1].

[1]: http://notmuchmail.org/news/
---
 NEWS | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/NEWS b/NEWS
index d4f4ea4..e26fa0a 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,26 @@ Bug fix for saved searches with newlines in them.
   Split lines confuse `notmuch count --batch`, so we remove embedded
   newlines before calling notmuch count.
 
+nmbug
+-----
+
+nmbug adds a `clone` command for setting up the initial repository and
+uses `@{upstream}` instead of `FETCH_HEAD` to track upstream changes.
+
+  The `@{upstream}` change reduces ambiguity when fetching multiple
+  branches, but requires existing users update their bare `NMBGIT`
+  repository (usually `~/.nmbug`) to a non-bare repository.  The
+  easiest way to do this is:
+
+  1. Push any local commits to a remote repository.
+  2. Remove your `NMBGIT` repository (e.g. `mv .nmbug .nmbug.bak`).
+  3. Use the new `clone` command to create a fresh clone:
+
+        nmbug clone nmbug@nmbug.tethera.net:nmbug-tags
+
+  4. If you had local commits in step 1, add a remote for that
+     repository and fetch them into the new repository.
+
 Notmuch 0.17 (2013-12-30)
 =========================
 
-- 
1.9.1.353.gc66d89d

  reply	other threads:[~2014-04-08 15:58 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-10  0:28 [PATCH v2] nmbug: Add 'clone' and replace FETCH_HEAD with @{upstream} W. Trevor King
2014-04-06 12:27 ` David Bremner
2014-04-08 11:11 ` WARNING: backwards incompatible change to nmbug pushed David Bremner
2014-04-08 15:57   ` W. Trevor King [this message]
2014-04-09 11:22     ` [PATCH] NEWS: Document the recent 'nmbug clone' and @{upstream} changes David Bremner
2014-04-09 21:01       ` W. Trevor King
2014-04-10  1:01         ` David Bremner
2014-04-10  2:05           ` W. Trevor King
2014-04-08 11:12 ` [PATCH v2] nmbug: Add 'clone' and replace FETCH_HEAD with @{upstream} David Bremner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=151b4a1b9612daa53fb47b60f0aa65f7a8e5ef5e.1396972599.git.wking@tremily.us \
    --to=wking@tremily.us \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).