StarMirror/CppCoreGuidelines
1
0
Fork 0
mirror of https://github.com/isocpp/CppCoreGuidelines.git synced 2024-03-22 13:30:58 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/isocpp/CppCoreGuidelines into final_action

Browse Source 
Conflicts:
	CppCoreGuidelines.md
This commit is contained in:
Treb Connell 2015-09-28 15:23:12 -07:00
commit 462590319a
2 changed files with 991 additions and 1393 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CONTRIBUTING.md
View File

@ -40,8 +40,12 @@ to display, reproduce, perform, distribute and create derivative works of that m
## Pull requests ## Pull requests
We welcome pull requests for scoped changes to the guidelines--bug fixes in examples, clarifying ambiguous text, etc. Proposed changes should We welcome pull requests for scoped changes to the guidelines--bug fixes in examples, clarifying ambiguous text, etc. Significant changes should
first be discussed in the [Issues](https://github.com/isocpp/CppCoreGuidelines/issues) and the Issue number must be included in the pull first be discussed in the [Issues](https://github.com/isocpp/CppCoreGuidelines/issues) and the Issue number must be included in the pull
request. Changes should be made in a child commit of a recent commit in the master branch. Lastly, to avoid line ending issues, please request. Also please specify the rule number in your Issue and PR.
set `autocrlf = input` and `whitespace = cr-at-eol` in your git configuration.
Changes should be made in a child commit of a recent commit in the master branch. Also, if you are making many small changes please create
separate PRs to minimize merge issues.
Lastly, to avoid line ending issues, please set `autocrlf = input` and `whitespace = cr-at-eol` in your git configuration.

2196
CppCoreGuidelines.md
View File

File diff suppressed because it is too large Load Diff