aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@leaflabs.com>2011-10-07 15:21:29 -0400
committerMarti Bolivar <mbolivar@leaflabs.com>2011-10-07 15:29:31 -0400
commit5051a512141f642f90f53f2749ddd8cc815226e4 (patch)
treed5a88e339c1c74d7cac844df3dc172c9a8514840
parent2e1cf62fa2e24c168300197974f061646a913f5e (diff)
downloadlibrambutan-5051a512141f642f90f53f2749ddd8cc815226e4.tar.gz
librambutan-5051a512141f642f90f53f2749ddd8cc815226e4.zip
README: More on how to maintain releases.
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
-rw-r--r--README29
1 files changed, 26 insertions, 3 deletions
diff --git a/README b/README
index 2fe5092..4cdf66f 100644
--- a/README
+++ b/README
@@ -310,11 +310,34 @@ It needs to be updated RIGHT AWAY, you say? Here's what you do:
- Make your changes.
-- Rebuild the docs (see the last two steps in "Cutting the Release").
+- Rebuild the docs (see the last two steps in "Cutting the Release")
+ and look at the changed pages.
-- If your changes need to happen on the master branch, make them
+- If your changes also need to happen on the master branch, make them
appropriately.
+ Advice: git cherry-pick is your friend. Let's say you're on branch
+ "vX.Y.Z-maintenance", and you want to get commit C onto master:
+
+ o---C vX.Y.Z-maintenance
+ /
+ -o---o---o---o master
+
+ The recipe is:
+
+ $ git checkout master
+ $ git cherry-pick C
+
+ Which (if there are no conflicts) will result in:
+
+ o---C vX.Y.Z-maintenance
+ /
+ -o---o---o---o---C' master
+
+ Where C' performs the same changes as C.
+
- Push your fixes to GitHub.
-- Distribute the updated docs.
+- Distribute the updated docs. These are world-visible here:
+
+ http://static.leaflabs.com/pub/leaflabs/maple-docs/