diff options
| author | Andrey Andreev <narf@devilix.net> | 2018-06-01 16:07:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-01 16:07:32 +0200 |
| commit | b1769f962d74adff766666e2b3e055191bf94b63 (patch) | |
| tree | 3af32c2d6350f870479fd8515e40b8f3a06d5b98 /contributing.md | |
| parent | 67cf9daa7857917dce389befd9605609f7e65bcf (diff) | |
| parent | 52a87e506d4fc70bd5922b07a532852d28f28ab6 (diff) | |
[ci skip] Merge pull request #5503 from mehdibo/http-to-https
http:// to https://
Diffstat (limited to 'contributing.md')
| -rw-r--r-- | contributing.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contributing.md b/contributing.md index d0df9b966..65ff9501a 100644 --- a/contributing.md +++ b/contributing.md @@ -36,7 +36,7 @@ there must be a fallback for PHP 5.2.4. ### Branching -CodeIgniter uses the [Git-Flow](http://nvie.com/posts/a-successful-git-branching-model/) branching model which requires all pull requests to be sent to the "develop" branch. This is +CodeIgniter uses the [Git-Flow](https://nvie.com/posts/a-successful-git-branching-model/) branching model which requires all pull requests to be sent to the "develop" branch. This is where the next planned version will be developed. The "master" branch will always contain the latest stable version and is kept clean so a "hotfix" (e.g: an emergency security patch) can be applied to master to create a new version, without worrying about other features holding it up. For this reason all commits need to be made to "develop" and any sent to "master" will be closed automatically. If you have multiple changes to submit, please place all changes into their own branch on your fork. One thing at a time: A pull request should only contain one change. That does not mean only one commit, but one change - however many commits it took. The reason for this is that if you change X and Y but send a pull request for both at the same time, we might really want X but disagree with Y, meaning we cannot merge the request. Using the Git-Flow branching model you can create new branches for both of these features and send two requests. @@ -55,7 +55,7 @@ This will sign your commits with the information setup in your git config, e.g. `Signed-off-by: John Q Public <john.public@example.com>` -If you are using [Tower](http://www.git-tower.com/) there is a "Sign-Off" checkbox in the commit window. You could even alias git commit to use the `-s` flag so you don’t have to think about it. +If you are using [Tower](https://www.git-tower.com/) there is a "Sign-Off" checkbox in the commit window. You could even alias git commit to use the `-s` flag so you don’t have to think about it. By signing your work in this manner, you certify to a "Developer's Certificate of Origin". The current version of this certificate is in the `DCO.txt` file in the root of this repository. |