Further drafting of precommit (really, pre-push-to-master) code review process.
diff --git a/CodeReview.wiki b/CodeReview.wiki index 638a7ee..79ace10 100644 --- a/CodeReview.wiki +++ b/CodeReview.wiki
@@ -5,10 +5,6 @@ All commits and must be reviewed by at least one Melange engineer other than the author before migration to the master branch. -= Exceptions = - -Commits made as part of the release process ("Set new Melange version number...") are exempt and may be made on master. - = Author Process = When you feel that your current line of development is ready for review: @@ -21,11 +17,22 @@ = Sample Author Commands = -*TODO(nathaniel)* but the important one is {{{git push origin <commit hex string, not branch name>:master}}}, which will either push a specific reviewed commit to master or fail as non-fast-forward. +== Pulling from origin == +{{{git pull --no-rebase --no-commit}}} + +== Pushing commits to a branch for review == +{{{git push origin <hex string of commit to be reviewed>:<review branch name>}}} + +== Pushing reviewed commits to master == +{{{git push origin <latest reviewed commit hex string, not branch name or other alias>:master}}} - this will either push your specific reviewed commits to master or fail as non-fast-forward (in which case you'll have to merge and undergo further review). = Rebase = *Do not rebase.* We lose review history and chronological ordering with rebases. Linear history just isn't worth it. = Reviewer Process = -If a change looks good and needs no comment, just mark it positive and hit the "submit" button. This suppresses the per-commit email thread and cuts down on mailing list noise. \ No newline at end of file +If a change looks good and needs no comment, just mark it positive and hit the "submit" button. This suppresses the per-commit email thread and cuts down on mailing list noise. + += Exceptions = + +Commits made as part of the release process ("Set new Melange version number...") are exempt and may be made on master. They should still be reviewed when convenient, though. \ No newline at end of file