summaryrefslogtreecommitdiffstats
path: root/docs/devinfo.html
diff options
context:
space:
mode:
authorAndreas Boll <andreas.boll.dev@gmail.com>2012-10-02 13:55:53 +0200
committerAndreas Boll <andreas.boll.dev@gmail.com>2012-10-02 15:44:28 +0200
commit1f38fb2697377e19c6585d01edcec6eec0e0c325 (patch)
treeef51a37846dcb3e6b30a5244805925e132371f1e /docs/devinfo.html
parentf07784d9badfdbb5dc8d26d1c1cbd355216307c8 (diff)
downloadexternal_mesa3d-1f38fb2697377e19c6585d01edcec6eec0e0c325.zip
external_mesa3d-1f38fb2697377e19c6585d01edcec6eec0e0c325.tar.gz
external_mesa3d-1f38fb2697377e19c6585d01edcec6eec0e0c325.tar.bz2
docs: document how to apply a candidate to a stable branch
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'docs/devinfo.html')
-rw-r--r--docs/devinfo.html8
1 files changed, 8 insertions, 0 deletions
diff --git a/docs/devinfo.html b/docs/devinfo.html
index a52a11e..8f4aeef 100644
--- a/docs/devinfo.html
+++ b/docs/devinfo.html
@@ -172,6 +172,14 @@ Here are some examples of such a note:
<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 &lt;commit&gt;</code> for cherry-picking a commit
+from master to a stable branch.
+</p>
+
<h2>Making a New Mesa Release</h2>
<p>