Merge tag '0.20_rc1'

[notmuch] / NEWS

diff --git a/NEWS b/NEWS
index 70ad3f3a90a0160d75b1ea7f38b6c87e3dd83902..25e5b5a5f10ba5886c6a902b80d39127a7a5e18d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,21 @@ Contrib
 previously provided by `notmuch-deliver` should now be provided by
 `notmuch insert`, provided by the main notmuch binary.
 
+nmbug-status
+------------
+
+`nmbug-status` now only matches local branches when reading
+`status-config.json` from the `config` branch of the `NMBGIT`
+repository.  To help new users running `nmbug-status`, `nmbug clone`
+now creates a local `config` branch tracking `origin/config`.  Folks
+who use `nmbug-status` with an in-Git config (i.e. you don't use the
+`--config` option) who already have `NMBGIT` set up are encouraged to
+run:
+
+    git checkout config origin/config
+
+in their `NMBGIT` repository (usually `~/.nmbug`).
+
 Notmuch 0.19 (2014-11-14)
 =========================
 
@@ -167,7 +182,7 @@ nmbug
 
 The Perl script has been translated to Python; you'll need Python 2.7
 or anything from the 3.x line.  Most of the user-facing interface is
-the same, but `nmbug help` is not `nmbug --help`, and the following nmbug
+the same, but `nmbug help` is now `nmbug --help`, and the following nmbug
 commands have slightly different interfaces: `archive`, `commit`,
 `fetch`, `log`, `pull`, `push`, and `status`.  For details on the
 new interface for a given command, run `nmbug COMMAND --help`.