Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Desportes <williamdes@wdes.fr>2019-05-27 21:12:05 +0300
committerWilliam Desportes <williamdes@wdes.fr>2019-05-27 21:12:05 +0300
commit6bceb49d02defa91336c217b12833e94be20bc12 (patch)
tree9095c910e82982ea69cc8ffa44967c3c021d7ce3
parentdafc17c52ef1c0bd7480abcff1899273cd7bead3 (diff)
Change DCO examples to use real world ones
Pull-request: #768 (reference) Signed-off-by: William Desportes <williamdes@wdes.fr>
-rw-r--r--CONTRIBUTING.md5
-rw-r--r--DCO2
2 files changed, 5 insertions, 2 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e3197efe1f..3663809932 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -20,7 +20,7 @@ Please report [bugs on GitHub][1].
## Patches submission
Patches are welcome as [pull requests on GitHub][2]. Please include a
-Signed-off-by tag in the commit message (you can do this by passing `--signoff`
+Signed-off-by tag in the commit message (you can do this by passing [`--signoff`][4]
parameter to Git).
When creating the commit on GitHub or using some other tool which does not have
@@ -28,6 +28,8 @@ direct support for this, it is the same as adding
`Signed-off-by: Your name <email@example.com>`
as the last line of the commit message.
+Example: `Signed-off-by: Jane Smith <jane.smith@example.org>`
+
Note that by submitting patches with the Signed-off-by tag, you are giving
permission to license the patch as GPLv2-or-later. See [the DCO file][3] for
details.
@@ -35,6 +37,7 @@ details.
[2]: https://github.com/phpmyadmin/phpmyadmin/pulls
[3]: https://github.com/phpmyadmin/phpmyadmin/blob/master/DCO
+[4]: https://git-scm.com/docs/git-commit#Documentation/git-commit.txt---signoff
## More information
diff --git a/DCO b/DCO
index 49b75da9b7..824c724d25 100644
--- a/DCO
+++ b/DCO
@@ -34,7 +34,7 @@ By making a contribution to this project, I certify that:
And please confirm your certification to the above by adding the following
line to your patch:
- Signed-off-by: Jane Developer <jane@example.org>
+ Signed-off-by: Jane Smith <jane.smith@example.org>
using your real name (sorry, no pseudonyms or anonymous contributions).