Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mpcs
dfss
Commits
2c8b21cc
Commit
2c8b21cc
authored
Dec 16, 2015
by
Loïck Bonniot
Browse files
[minor] Update CONTRIBUTING.md
parent
b22dadec
Pipeline
#96
passed with stage
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CONTRIBUTING.md
View file @
2c8b21cc
...
...
@@ -120,28 +120,28 @@ project:
1.
Fork the project, clone your fork,
and configure the remotes:
```
bash
# Clone your fork of the repo into the current directory
git clone https://gitlab.insa-rennes.fr/<your-username>/<repo-name>
# Navigate to the newly cloned directory
cd
<repo-name>
# Assign the original repo to a remote called "upstream"
git remote add upstream https://gitlab.insa-rennes.fr/mpcs/dfss
```
```
bash
# Clone your fork of the repo into the current directory
git clone https://gitlab.insa-rennes.fr/<your-username>/<repo-name>
# Navigate to the newly cloned directory
cd
<repo-name>
# Assign the original repo to a remote called "upstream"
git remote add upstream https://gitlab.insa-rennes.fr/mpcs/dfss
```
2.
If you cloned a while ago, get the latest changes from upstream:
```
bash
git checkout <dev-branch>
git pull upstream <dev-branch>
```
```
bash
git checkout <dev-branch>
git pull upstream <dev-branch>
```
3.
Create a new topic branch (off the main project development branch) to
contain your feature, change, or fix:
```
bash
git checkout
-b
<topic-branch-name>
```
```
bash
git checkout
-b
<topic-branch-name>
```
4.
Commit your changes in logical chunks. Please adhere to these
[
git commit
message guidelines
](
http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
)
...
...
@@ -153,15 +153,15 @@ project:
5.
Locally merge (or rebase) the upstream development branch into your topic branch:
```
bash
git pull
[
--rebase
]
upstream <dev-branch>
```
```
bash
git pull
[
--rebase
]
upstream <dev-branch>
```
6.
Push your topic branch up to your fork:
```
bash
git push origin <topic-branch-name>
```
```
bash
git push origin <topic-branch-name>
```
7.
Open a Pull Request with a clear title and description.
...
...
Write
Preview
Supports
Markdown
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