Differences
This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revisionNext revisionBoth sides next revision | ||
dev:howto:contribute [2013/02/02 13:36] – [Contribution Process] jannis | dev:howto:contribute [2013/02/02 13:48] – [Contribution Process] jannis | ||
---|---|---|---|
Line 63: | Line 63: | ||
This will drop you in an editor where you are being asked to define a subject and a message for the patch set you are submitting. The editor window will roughly look like this: | This will drop you in an editor where you are being asked to define a subject and a message for the patch set you are submitting. The editor window will roughly look like this: | ||
- | From 451e2ab7ea3d595476ec5e57f33da8eef1661773 | + | From 451e2ab7ea3d595476ec5e57f33da8eef1661773 |
From: Jannis Pohlmann | From: Jannis Pohlmann | ||
Date: Thu, 10 Jan 2013 09:25:18 +0100 | Date: Thu, 10 Jan 2013 09:25:18 +0100 | ||
Line 69: | Line 69: | ||
| | ||
***MESSAGE*** | ***MESSAGE*** | ||
+ | | ||
... auto-generated git log and diff stats ... | ... auto-generated git log and diff stats ... | ||
- | Fill out the SUBJECT and MESSAGE by briefly describing what you are submitting. Then save the file and close the editor. '' | + | Fill out the SUBJECT and MESSAGE by briefly describing what you are submitting. Then save the file and close the editor. '' |
=== 5. Review === | === 5. Review === | ||
+ | |||
+ | Once submitted to '' | ||
+ | |||
+ | * Testing the changes. | ||
+ | * Comments on: | ||
+ | * Coding style and bad code design | ||
+ | * Potential issues | ||
+ | * Possible side-effects | ||
+ | |||
+ | The reviews will be sent as replies to your cover letter and patch emails. Thanks to having the patches included in your submission as plain text, they can be commented on in-line. | ||
+ | |||
+ | Reviews may be performed in multiple rounds. If your submission is rejected, you are advised to rework your branch and re-submit it using the same approach as described above. | ||
=== 6. Merge === | === 6. Merge === | ||
+ | |||
+ | Once you get an ok, one of the reviewers will pull your branch into the official repository and merge as follows: | ||
+ | |||
+ | git checkout master | ||
+ | git merge --no-ff <your username>/< | ||
+ | | ||
+ | This will result in an explicit merge commit, confirming in the git history that your changes have been merged. | ||
+ | |||
+ | At the bottom of the merge commit message, the reviewer should add the following lines: | ||
+ | |||
+ | Signed-off-by: | ||
+ | Reviewed-by: | ||
+ | Reviewed-by: | ||
+ | | ||
+ | These fields are defined in the [[http:// |