Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A few small fixes to documentation #62

Merged
merged 6 commits into from
Sep 25, 2023
Merged

A few small fixes to documentation #62

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b8a2df9
List correct branch to base changes on in CONTRIBUTING.md
tcmoore3 Sep 19, 2023
596834f
Update PULL_REQUEST_TEMPLATE.md
tcmoore3 Sep 19, 2023
4fd7140
Add contributors line back to PR template
tcmoore3 Sep 23, 2023
6531fad
Add mailmap
tcmoore3 Sep 23, 2023
9c4933c
Add CONTRIBUTORS.md
tcmoore3 Sep 23, 2023
e847901
Update CONTRIBUTORS.md
joaander Sep 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,3 @@ Resolves #???

- [ ] I have reviewed the [**Contributor Guidelines**](https://github.com/glotzerlab/hoomd-validation/blob/trunk/CONTRIBUTING.md).
- [ ] I agree with the terms of the [**HOOMD-blue Contributor Agreement**](https://github.com/glotzerlab/hoomd-validation/blob/trunk/ContributorAgreement.md).
- [ ] My name is on the list of contributors (`CONTRIBUTORS.md`) in the pull request source branch.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keep this line and instead add CONTRIBUTORS.md along with the needed .mailmap so that git shortlog produces the expected results.

Here are the contributors on trunk after removing bots:

   324  Joshua A. Anderson <[email protected]>
   106  Tommy Waltmann <[email protected]>
    19  Tommy Waltmann <[email protected]>
    10  tommy-waltmann <[email protected]>
     6  Tim Moore <[email protected]>
     6  Tim Moore <[email protected]>
     3  Brandon Butler <[email protected]>

2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ the project.

## Base your work off the correct branch

All new work should be based on `main`.
All new work should be based on `trunk`.

## Propose a minimal set of related changes

Expand Down