Skip to content

Commit

Permalink
doc: explains why Reviewed-By is added in PRs
Browse files Browse the repository at this point in the history
Adds verbose reasons to the documentation on why the
Reviewed-By metadata on a pull request is important.
This was loosely mentioned as an issue in the referenced
issue below, and answered by @addaleax.

Ref: #8893

change wording on documentation update

Changes the initial commit to the recommended, and more
accurate wording.

Removed time qualifiers on documentation for git merge

removes the ugly wording

add a new reason why autosquashing is prohibited
  • Loading branch information
jalafel committed Oct 13, 2016
1 parent d42d56f commit 177d880
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 2 additions & 0 deletions COLLABORATOR_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ information regarding the change process:

- A `Reviewed-By: Name <email>` line for yourself and any
other Collaborators who have reviewed the change.
- Useful for @mentions / contact list if something goes wrong in the PR.
- Protects against the assumption that GitHub will be around forever.
- A `PR-URL:` line that references the *full* GitHub URL of the original
pull request being merged so it's easy to trace a commit back to the
conversation that led up to that change.
Expand Down
7 changes: 4 additions & 3 deletions doc/onboarding.md
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,11 @@ onboarding session.
* Please never use GitHub's green ["Merge Pull Request"](https://help.github.com/articles/merging-a-pull-request/#merging-a-pull-request-using-the-github-web-interface) button.
* If you do, please force-push removing the merge.
* Reasons for not using the web interface button:
* The old merge method will write an ugly commit message.
* The old rebase & merge method adds metadata to the commit title.
* The latest rebase method changes the author.
* The merge method will add an unnecessary merge commit.
* The rebase & merge method adds metadata to the commit title.
* The rebase method changes the author.
* The squash & merge method has been known to add metadata to the commit title.
* If more than one author has contributed to the PR, only the latest author will be considered during the squashing.


Update your `master` branch (or whichever branch you are landing on, almost always `master`)
Expand Down

0 comments on commit 177d880

Please sign in to comment.