X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=nmbug.mdwn;h=d80d4b26295f200f9f0c6d151f4973e3f61c7958;hb=857d6e6b2194bacfac69f69c3a713a3c73ba8eb5;hp=dd22a768b735993b214982a7c41147ae85ba7726;hpb=aef8bfbc6a07c44d905c05c6ce9c3ed7c8ecb2d1;p=obsolete%2Fnotmuch-wiki

diff --git a/nmbug.mdwn b/nmbug.mdwn
index dd22a76..d80d4b2 100644
--- a/nmbug.mdwn
+++ b/nmbug.mdwn
@@ -9,20 +9,48 @@
     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, simple example
 
-## Using nmbug
+    # get the latest version of the tags
+    $ nmbug pull
 
-    # suck in the tags
-    $ nmbug checkout
-
-    [ do some tagging; see below for conventions ]
+    # do some tagging; see below for conventions 
+    
+    $ notmuch tag +notmuch::patch $id
     
+    # 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/id1/patch
+     d   tags/id2/pushed     
+    
+    # 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.
 
@@ -70,7 +98,7 @@ them, the tree looks something like
     tags/87aa8j7hqu.fsf@zancas.localnet/patch
     tags/87aa8j7hqu.fsf@zancas.localnet/pushed
 
-The `%25` represents hex code for a character that cannut be used directly
+The `%25` represents hex code for a character that cannot be used directly
 (in this case %, only because it is needed as an escape).
 
 ### Assumptions