diff options
| author | Jakub Kądziołka <kuba@kadziolka.net> | 2021-02-14 14:15:32 +0100 |
|---|---|---|
| committer | Jakub Kądziołka <kuba@kadziolka.net> | 2021-02-14 14:15:32 +0100 |
| commit | 8970fb019aff5eebedd100ce1f2c972cbe929f18 (patch) | |
| tree | 20a57574370a70b0fd50ce25ea356b6a0a9671b4 /doc/contributing.texi | |
| parent | 3afcb87b0b1c8365aa4fa06df9731f069d99dcfe (diff) | |
| parent | 19783b9f553e433743fd695302df8cac4ec91ae1 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'doc/contributing.texi')
| -rw-r--r-- | doc/contributing.texi | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/doc/contributing.texi b/doc/contributing.texi index f167df067c..3baedb0654 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -1086,10 +1086,12 @@ everything has been successfully built. This allows us to fix issues before they hit users, and to reduce the window during which pre-built binaries are not available. -Generally, branches other than @code{master} are considered -@emph{frozen} if there has been a recent evaluation, or there is a -corresponding @code{-next} branch. Please ask on the mailing list or -IRC if unsure where to place a patch. +When we decide to start building the @code{staging} or +@code{core-updates} branches, they will be forked and renamed with the +suffix @code{-frozen}, at which time only bug fixes may be pushed to the +frozen branches. The @code{core-updates} and @code{staging} branches +will remain open to accept patches for the next cycle. Please ask on +the mailing list or IRC if unsure where to place a patch. @c TODO: It would be good with badges on the website that tracks these @c branches. Or maybe even a status page. |