Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Nektar
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
84
Issues
84
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
44
Merge Requests
44
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nektar
Nektar
Commits
20bb3c99
Commit
20bb3c99
authored
Jun 14, 2017
by
Chris Cantwell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed text and added script.
(cherry picked from commit
508fd298
)
parent
35426444
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
1 deletion
+19
-1
CONTRIBUTING.md
CONTRIBUTING.md
+19
-1
No files found.
CONTRIBUTING.md
View file @
20bb3c99
...
@@ -165,7 +165,8 @@ major release, `y` a minor release and `z` a patch release:
...
@@ -165,7 +165,8 @@ major release, `y` a minor release and `z` a patch release:
denote major changes in functionality and the API;
denote major changes in functionality and the API;
-
minor releases occur around twice per year and contain new features with minor
-
minor releases occur around twice per year and contain new features with minor
API changes;
API changes;
-
patch releases are targeted on rougly a monthly basis and are intended to
-
patch releases are targeted on roughly a monthly basis and are intended to
fix minor issues in the code.
The repository contains a number of _release branches_ named
`release/x.y`
for
The repository contains a number of _release branches_ named
`release/x.y`
for
each minor release, which are intended to contain
**
fixes and very minor
each minor release, which are intended to contain
**
fixes and very minor
...
@@ -211,6 +212,23 @@ following additional steps to cherry pick commits into the `release/x.y` branch.
...
@@ -211,6 +212,23 @@ following additional steps to cherry pick commits into the `release/x.y` branch.
8.
If everything becomes horribly broken,
`git cherry-pick --abort`
.
8.
If everything becomes horribly broken,
`git cherry-pick --abort`
.
9.
Once you're happy,
`git push`
to send your changes back to GitLab.
9.
Once you're happy,
`git push`
to send your changes back to GitLab.
Steps 5 and 6 can be simplified by creating a script
```
bash
#!/bin/bash
src
=
$1
logopts
=
"--oneline --no-merges --reverse"
commits
=
`
git log
$logopts
master..
$1
|
cut
-f
1
-d
" "
| xargs
`
echo
"Will cherry-pick the following commits:
$commits
"
echo
"Press ENTER to continue..."
read
cherryopts
=
"-x --allow-empty --allow-empty-message"
git cherry-pick
$cherryopts
$commits
```
which accepts the name of the source branch as the sole argument.
## Formatting guidelines
## Formatting guidelines
Nektar++ uses C++, a language notorious for being easy to make obtuse and
Nektar++ uses C++, a language notorious for being easy to make obtuse and
difficult to follow code. To hopefully alleviate this problem, there are a
difficult to follow code. To hopefully alleviate this problem, there are a
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment