Changeset 43d4ccb for docs

Timestamp:

Sep 24, 2012, 1:26:04 AM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

8eca9da

Parents:

4bf8692

git-author:

Alex Dehnert <adehnert@…> (09/24/12 01:26:04)

git-committer:

Alex Dehnert <adehnert@…> (09/24/12 01:26:04)

Message:

Update deploy docs to mention stage branch

File:

• docs/deploy.txt (modified) (1 diff)

docs/deploy.txt

@@ -8 +8 @@
     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