Browse code

Update CONTRIBUTING.md and test new DCO signature in this commit

Signed-off-by: Tibor Vass <teabee89@gmail.com>

Tibor Vass authored on 2014/08/02 04:23:09
Showing 1 changed files
... ...
@@ -208,18 +208,16 @@ By making a contribution to this project, I certify that:
208 208
 
209 209
 Then you just add a line to every git commit message:
210 210
 
211
-    Docker-DCO-1.1-Signed-off-by: Joe Smith <joe.smith@email.com> (github: github_handle)
211
+    Signed-off-by: Joe Smith <joe.smith@email.com>
212 212
 
213 213
 Using your real name (sorry, no pseudonyms or anonymous contributions.)
214 214
 
215
-One way to automate this, is customize your git `commit.template` by adding
216
-a `prepare-commit-msg` hook to your Docker repository:
215
+If you set your `user.name` and `user.email` git configs, you can sign your
216
+commit automatically with `git commit -s`.
217 217
 
218
-```
219
-curl -sSL -o .git/hooks/prepare-commit-msg https://raw.githubusercontent.com/docker/docker/master/contrib/prepare-commit-msg.hook && chmod +x .git/hooks/prepare-commit-msg
220
-```
221
-
222
-* Note: the above script expects to find your GitHub user name in `git config --get github.user`
218
+Note that the old-style `Docker-DCO-1.1-Signed-off-by: ...` format is still
219
+accepted, so there is no need to update outstanding pull requests to the new
220
+format right away, but please do adjust your processes for future contributions.
223 221
 
224 222
 #### Small patch exception
225 223