Index: en_US.ISO8859-1/articles/committers-guide/article.xml =================================================================== --- en_US.ISO8859-1/articles/committers-guide/article.xml +++ en_US.ISO8859-1/articles/committers-guide/article.xml @@ -4803,6 +4803,21 @@ Host repo.freebsd.org # Can be *.freebsd.org User freebsd-login + + + The script is also able to merge more than one + revision at a time. If for instance there have been + other updates to the port since the branch was made + that have not been merged because they were not + security related. Add the different revisions, in the + right order on the mfh command + line. When prompted for the commit message, it will + have concatenated all of the original commits, so you + will need to edit it to fit what you are really + doing. + + &prompt.user; /usr/ports/Tools/scripts/mfh 2016Q1 r407208 r407713 r407722 r408567 r408943 r410728 +