X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=nmbug.mdwn;h=d80d4b26295f200f9f0c6d151f4973e3f61c7958;hb=857d6e6b2194bacfac69f69c3a713a3c73ba8eb5;hp=43290b200f37a66cd107d2da9676da16be8915fb;hpb=2dd16cdbcb40ef75184bc2accd506a5ad9d2f1c8;p=notmuch-wiki

diff --git a/nmbug.mdwn b/nmbug.mdwn
index 43290b2..d80d4b2 100644
--- a/nmbug.mdwn
+++ b/nmbug.mdwn
@@ -9,11 +9,11 @@
     Currently you need at least the version of notmuch in master, and
     the script in contrib/nmbug.
       
-2. The current tag repo is at
+2. The current tag repo can be obtained by
 
     git clone --bare git://pivot.cs.unb.ca/nmbug.git $HOME/.nmbug
 
-## Using nmbug
+## Using nmbug, simple example
 
     # get the latest version of the tags
     $ nmbug pull
@@ -22,13 +22,36 @@
     
     $ notmuch tag +notmuch::patch $id
     
-    # optionally inspect your changes
+    # write the tag changes from the notmuch database
+    $ nmbug commit
+
+## Using nmbug, doing the same thing with more steps
+
+    # get the latest version of the tags
+    $ nmbug fetch
+
+    # Optionally inspect the fetched changes
+
     $ nmbug status      
-    A   tags/$id/patch
+     a   tags/id1/patch
+     d   tags/id2/pushed     
     
-    # write the tag changes from the notmuch
-    $ nmbug commit
+    # merge the fetched tags into notmuch
+    $ nmbug merge
+    
+    # observe status is clear now,
+    $ nmbug status
+
+    # make the tag changes
+    $ notmuch tag +notmuch::patch id
+
+    # double checkout your changes
+    $ nmbug status
+    A tags/id/patch
     
+    # write the tag changes 
+    $ nmbug commit
+
 ## Submitting tags.
 
    For the moment, we are using a central repo, hosted at