forked from OpenXRay/xray-16
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of https://github.com/Swartz27/cop
- Loading branch information
Showing
5 changed files
with
939 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
All source code included with this distribution, unless declared otherwise, | ||
is commercial GSC Game World proprietary code. | ||
|
||
Redistribution and use in source and binary forms, with or without | ||
modification, are permitted provided that the following conditions are met: | ||
|
||
1. Redistributions of source code must retain the above copyright notice, this | ||
list of conditions and the following disclaimer. | ||
|
||
2. Redistributions in binary form must reproduce the above copyright notice, | ||
this list of conditions and the following disclaimer in the documentation | ||
and/or other materials provided with the distribution. | ||
|
||
3. Neither binary nor source code redistributions may be used for any | ||
commercial purposes. | ||
|
||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
THE SOFTWARE. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
TITLE: Commit message conventions | ||
|
||
The format of commit message should be a short description of what you did. | ||
After the description, the bug ID, review ID or anything else. | ||
|
||
The commit log should not contain the obvious. If you change file Foo.cpp: | ||
|
||
BAD: | ||
"Fix bug in Foo.cpp" | ||
BAD: | ||
"Fix #45" | ||
BAD: | ||
"Commit Foo.cpp" | ||
GOOD: | ||
"Fix buffer overflow (close #45)." | ||
|
||
The above does not mean that when you do a complex change do not write a | ||
description of what you did, on the contrary. When a long description is | ||
needed do add as much as needed to explain the change, just do not add | ||
meaningless information (committing Foo.cpp etc.) | ||
|
||
It is advisable to split complex commits to several smaller commits if | ||
possible. If you see that your commit massage contain more then one topic, you | ||
probably can and should split the commit into a few unrelated commits. |
Oops, something went wrong.