dsg/mesa
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

docs/submittingpatches: mention use of the -x flag of git cherry-pick when backporting a commit

Browse source 
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13746>
This commit is contained in:
Eric Engestrom 2021-11-10 11:08:05 +00:00 • committed by Marge Bot
parent d47bfd56de
commit df93e7aeee
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/submittingpatches.rst
View file

@ -360,6 +360,12 @@ appropriate. The MR should be based on and target the
per the stable branch policy. Assigning the MR to release maintainer for
said branch or mentioning them is helpful, but not required.
Make sure to use ``git cherry-pick -x`` when cherry-picking the commits
from the main branch. This adds the "cherry picked from commit ..." line
to the commit message, to allow the release maintainters to mark those
as backported, which in turn allows the tools to correctly report any
future ``Fixes:`` affecting the commits you backported.
Documentation patches
---------------------