From: Tim Wood Date: Mon, 9 Apr 2012 16:24:16 +0000 (-0700) Subject: Documenting pull requests X-Git-Tag: 1.6.0~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b4cf85f7346a59324ca1c1afe0fdc54f4f57e237;p=thirdparty%2Fmoment.git Documenting pull requests --- diff --git a/README.markdown b/README.markdown index fd4690a68..7a25720b3 100755 --- a/README.markdown +++ b/README.markdown @@ -32,6 +32,19 @@ To minify all the files, use `make moment` to minify moment, `make langs` to min If your code passes the unit tests (including the ones you wrote), submit a pull request. +Submitting pull requests +======================== + +Moment.js now uses [git-flow](https://github.com/nvie/gitflow). If you're not familiar with git-flow, please read up on it, you'll be glad you did. + +When submitting new features, please create a new feature branch using `git flow feature start ` and submit the pull request to the `develop` branch. + +Pull requests for enhancements for features should be submitted to the `develop` branch as well. + +When submitting a bugfix, please check if there is an existing bugfix branch. If the latest stable version is `1.5.0`, the bugfix branch would be `hotfix/1.5.1`. All pull requests for bug fixes should be on a `hotfix` branch, unless the bug fix depends on a new feature. + +The `master` branch should always have the latest stable version. When bugfix or minor releases are needed, the develop/hotfix branch will be merged into master and released. + Thanks to... ============