From 6657fda58a868d9410136cd04e63a40a6a8d5fa6 Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Wed, 1 Jun 2016 17:17:57 -0700 Subject: [PATCH] releasing: Copyedit post-release branching directions --- releasing.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/releasing.txt b/releasing.txt index 9767912fe..0aae23a23 100644 --- a/releasing.txt +++ b/releasing.txt @@ -81,14 +81,14 @@ To make a release of Weston and/or Wayland, follow these steps. For x.y.0 releases, also create the release series x.y branch. The x.y branch is for bug fixes and conservative changes to the x.y.0 release, -and is where we release x.y.z releases from. Creating the x.y branch +and is where we create x.y.z releases from. Creating the x.y branch opens up master for new development and lets new development move on. We've done this both after the x.y.0 release (to focus development on bug fixing for the x.y.1 release for a little longer) or before the x.y.0 release (like we did with the 1.5.0 release, to unblock master development early). - $ git branch x.y + $ git branch x.y [sha] $ git push origin x.y The master branch configure.ac version should always be (at least)