diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2017-05-01 09:25:11 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2017-05-01 09:25:11 +0000 |
| commit | 9846a9ca5aa5f521dcffde907d661bf20d8c34fc (patch) | |
| tree | de3b425e2778d1aca8f1b9c04d5e3e4fce06eb39 /en_US.ISO8859-1/articles/committers-guide | |
| parent | c5bfd0f85211278373e440c27d90aceeb82b2f7b (diff) | |
Notes
Diffstat (limited to 'en_US.ISO8859-1/articles/committers-guide')
| -rw-r--r-- | en_US.ISO8859-1/articles/committers-guide/article.xml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml index e271005f87..3c9282d2e9 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.xml +++ b/en_US.ISO8859-1/articles/committers-guide/article.xml @@ -4487,7 +4487,16 @@ Relnotes: yes</programlisting> to the &a.ports-secteam; and the &a.portmgr; with the revision number and a small description of why the commit needs to be merged.</para> + </answer> + </qandaentry> + + <qandaentry xml:id="ports-qa-misc-commit-mfh"> + <question> + <para>What is the procedure for merging commits to the + quarterly branch?</para> + </question> + <answer> <para>A script is provided to automate merging a specific commit: <filename>ports/Tools/scripts/mfh</filename>. It is used as follows:</para> |