summaryrefslogtreecommitdiffstats
path: root/Documentation/howto-contribute.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/howto-contribute.txt')
-rw-r--r--Documentation/howto-contribute.txt26
1 files changed, 14 insertions, 12 deletions
diff --git a/Documentation/howto-contribute.txt b/Documentation/howto-contribute.txt
index 1b78277..97f3ce1 100644
--- a/Documentation/howto-contribute.txt
+++ b/Documentation/howto-contribute.txt
@@ -44,26 +44,28 @@ Repositories & Branches
* Primary repository is on kernel.org:
git clone git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git
- We use this repository for master and stable branches only.
-
* Backup repository at github.com:
git clone https://github.com/util-linux/util-linux.git
- We use this repository to backup kernel.org and for pull requests,
- issues tracking and topic branches. The master and stable branches are
- always pushed to the both repositories in the same time.
+ We use this repository to backup kernel.org and for PULL REQUESTS,
+ issues tracking. The master and stable branches are always pushed to
+ the both repositories in the same time.
It's recommended to use github.com for development.
* Branches:
- master - development for the next release
- stable/* - stable maintenance releases
-
- Github only:
-
- next - optionally used when master branch is frozen due to -rcN releases
- topic/* - long time development
+ master - continuous development
+ stable/vX.Y - stable releases
+
+ Since version 2.40, the "master" branch remains continuously open and is
+ never subjected to feature freezes. The stabilization process for
+ the upcoming release is exclusively conducted within the "stable/" branches.
+ Upon branching from "master" to "stable/vX.Y," a new tag vX.Y+1-devel
+ is generated to serve as placeholder for git-based versioning (refer to
+ tools/git-version-gen). Subsequently, changes specific to the new release
+ (such as po/ updates) are selectively cherry-picked from "stable/vX.Y" to
+ "master" after the final release.
Patching Process