diff options
| author | marha <marha@users.sourceforge.net> | 2012-10-04 10:58:53 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-10-04 10:58:53 +0200 |
| commit | bd13c464f728719fceb8a4918b52727ec125ea6e (patch) | |
| tree | 05a48375076036097a9e28356738c05a16cc5ed0 /mesalib/docs/devinfo.html | |
| parent | bab6395ded69210cbc550c0fb3765160e4405283 (diff) | |
| parent | 0130346adbce7e6b2422429887fc46c76806d845 (diff) | |
| download | vcxsrv-bd13c464f728719fceb8a4918b52727ec125ea6e.tar.gz vcxsrv-bd13c464f728719fceb8a4918b52727ec125ea6e.tar.bz2 vcxsrv-bd13c464f728719fceb8a4918b52727ec125ea6e.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
randrproto mesa pixman git update 4 oct 2012
Diffstat (limited to 'mesalib/docs/devinfo.html')
| -rw-r--r-- | mesalib/docs/devinfo.html | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/mesalib/docs/devinfo.html b/mesalib/docs/devinfo.html index 90752b750..8f4aeef5f 100644 --- a/mesalib/docs/devinfo.html +++ b/mesalib/docs/devinfo.html @@ -156,6 +156,30 @@ src/mesa/state_tracker/st_glsl_to_tgsi.cpp can serve as examples. </p> +<h2>Marking a commit as a candidate for a stable branch</h2> + +<p> +If you want a commit to be applied to a stable branch, +you should add an appropriate note to the commit message. +</p> + +<p> +Here are some examples of such a note: +</p> +<ul> + <li>NOTE: This is a candidate for the 9.0 branch.</li> + <li>NOTE: This is a candidate for the 8.0 and 9.0 branches.</li> + <li>NOTE: This is a candidate for the stable branches.</li> +</ul> + + +<h2>Cherry-picking candidates for a stable branch</h2> + +<p> +Please use <code>git cherry-pick -x <commit></code> for cherry-picking a commit +from master to a stable branch. +</p> + <h2>Making a New Mesa Release</h2> <p> |