Index: docs/deploy.txt
===================================================================
--- docs/deploy.txt	(revision 1898cc89d21075998d06d04174c083b1cde04dfa)
+++ docs/deploy.txt	(revision 43d4ccb5f9bb3fcb0ac7ea0fd3cec1948f840aa9)
@@ -8,6 +8,9 @@
     Summarize any interesting changes
 * run locally:
-    git checkout stable; git merge master; git checkout master
-    git push origin master stable
+    * One of the below, depending on whether you've developed beyond what's approved for release:
+        git checkout stable && git merge master && git checkout master
+        git checkout stable && git merge --ff-only stage && git checkout stage && git merge --ff-only master && git checkout master
+    * Push to the server
+        git push origin master stage stable
 * run on server
     git pull --ff-only