diff options
Diffstat (limited to 'RELEASE_PROCESS.markdown')
| -rw-r--r-- | RELEASE_PROCESS.markdown | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/RELEASE_PROCESS.markdown b/RELEASE_PROCESS.markdown index df20730..ea40d5d 100644 --- a/RELEASE_PROCESS.markdown +++ b/RELEASE_PROCESS.markdown @@ -3,8 +3,9 @@ * Work in a topic branch * Submit a github pull request * Address any comments / feeback - * Merge into master using --no-fw + * Merge into master using --no-ff * Update the CHANGELOG + * Update the Modulefile * Create an annotated tag with git tag -a X.Y.Z -m 'version X.Y.Z' * Push the tag with git push origin --tags * Build a new package with puppet-module |