Edited wiki page CodeReview through web user interface.
diff --git a/CodeReview.wiki b/CodeReview.wiki index 79ace10..28bd0fb 100644 --- a/CodeReview.wiki +++ b/CodeReview.wiki
@@ -20,15 +20,19 @@ == Pulling from origin == {{{git pull --no-rebase --no-commit}}} +Without the --no-commit flag, a pull operation that requires a commit will get an auto-created commit with an auto-generated log message like "Merge branch page-fix". Because our branch names are ephemeral we suppress the auto-created commit so that we may give any merge commit a message that describes the substance of what is being merged. + == 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). +{{{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. +*Do not rebase.* Rebases cause us to lose review history and chronological ordering of our work. A falsely 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.