diff options
author | Derek Jones <derek.jones@ellislab.com> | 2012-07-04 16:12:26 +0200 |
---|---|---|
committer | Derek Jones <derek.jones@ellislab.com> | 2012-07-04 16:12:26 +0200 |
commit | 36d1ac94a8b55485db30677a72bc3d57c3bb3cf8 (patch) | |
tree | a51308f576cc05cba9b5477d6eba9bbd192654a7 /readme.rst | |
parent | 6801d044d7f7b905e1fdaf21231f8a3fad5b4057 (diff) | |
parent | 1a85653e093d0f9b4028d808b57747cdbff17a65 (diff) |
Merge branch 'feature/user-guide-work' into develop
Conflicts:
user_guide_src/source/installation/upgrade_210.rst
user_guide_src/source/installation/upgrade_211.rst
user_guide_src/source/installation/upgrade_212.rst
Diffstat (limited to 'readme.rst')
-rw-r--r-- | readme.rst | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/readme.rst b/readme.rst index 7b718febb..b211ad7cd 100644 --- a/readme.rst +++ b/readme.rst @@ -115,6 +115,34 @@ 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. +Signing +======= +You must sign your work, certifying that you either wrote the work or +otherwise have the right to pass it on to an open source project. git makes +this trivial as you merely have to use `--signoff` on your commits to your +CodeIgniter fork. + +:: + + git commit --signoff + +or simply:: + + git commit -s + +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 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 +or Origin". The current version of this certificate is in the `DCO.txt` file +in the root of this repository. + + ************ How-to Guide ************ |