[PATCH 1/2] Add feature release instructions to MaintNotes addendum
From: <hidden>
Date: 2016-06-15 22:46:28
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
From: Raman Gupta <redacted> Based on a mailing list discussion, add the operations for creating a feature release. Signed-off-by: Raman Gupta <redacted> --- Documentation/howto/maintain-git.txt | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/Documentation/howto/maintain-git.txt b/Documentation/howto/maintain-git.txt
index 4357e26..f6ee0c5 100644
--- a/Documentation/howto/maintain-git.txt
+++ b/Documentation/howto/maintain-git.txt@@ -244,6 +244,35 @@ by doing the following: repo.or.cz +A feature release of git is made by tagging 'master' with a tag +matching vX.Y.Z, where X.Y.Z is the feature release version. + + - Optionally, track the current 'maint' branch to support + new releases for the older codebase if necessary. + + $ git branch maint-X.Y.(Z-1) maint + + - The 'maint' branch is updated to the new release. + + $ git checkout maint + $ git merge master + + This is equivalent to deleting maint and recreating it from + master, but it preserves the maint reflog. + + - The 'next' branch may be rebuilt from the tip of 'master' + using the surviving topics on 'next'. + + $ git branch -f next master + + (Again, this approach preserves the reflog and per-branch + configuration of 'next') + + $ git merge ai/topic_in_next1 + $ git merge ai/topic_in_next2 + ... + + Some observations to be made. * Each topic is tested individually, and also together with
--
1.6.2