Skip to content

Commit f430a7d

Browse files
authored
Merge pull request #22 from inbo/minor-corrections
Minor corrections
2 parents 6a3c67b + 5db25d7 commit f430a7d

1 file changed

Lines changed: 14 additions & 16 deletions

File tree

source/manual-git.Rmd

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ git push origin master
119119
120120
---
121121
122-
#### Go to your repo on GitHub to verify
122+
### Go to your repo on GitHub to verify
123123
124124
![Verify your commits on GitHub](manual-git/local-commit-on-github.png)
125125
@@ -197,12 +197,10 @@ git pull origin master
197197
A simple analysis to discover my favourite fruit colour.
198198
199199
3. Commit and push
200-
* in command line:
201-
```
200+
202201
git add <fixed files>
203202
git commit
204203
git push origin master
205-
```
206204
207205
---
208206
@@ -215,7 +213,7 @@ git pull origin master
215213
### Add a file
216214
217215
1. Add a `fruits.csv` file in a `/data` directory
218-
2. Link to this file the `README.md`
216+
2. Link to this file in the `README.md`
219217
220218
---
221219
@@ -227,7 +225,7 @@ git pull origin master
227225
228226
### Add a file: command line
229227
230-
`git commit -am "Mymessage"` <br/>
228+
`git commit -am "My message"` <br/>
231229
takes all changes in a single commit
232230
233231
```
@@ -340,13 +338,13 @@ git push origin analysis-script
340338
341339
---
342340
343-
### Review a (your) pull request
341+
### Review your pull request
344342
345343
![See pull request](manual-git/pr.png)
346344
347345
---
348346
349-
### Review a pull request
347+
### Review your pull request
350348
351349
1. Review
352350
2. If OK, merge pull request
@@ -434,16 +432,16 @@ git branch -d analysis-script
434432
435433
### Collaboration: issues
436434
437-
* Raise an `issue` online
435+
* Raise an **issue** online
438436
* Provide issues with an appropriate label
439-
* Assign your colleague to the `issue`
437+
* Assign your colleague to the issue
440438
441439
---
442440
443441
### Collaboration: online adaptations
444442
445443
* Make an adaptation to an online file
446-
* Propose a `pull request` and assign your collaborator
444+
* Propose a **pull request** and assign your collaborator
447445
* Merge the adaptation to the `master` branch
448446
449447
---
@@ -468,13 +466,13 @@ git branch -d analysis-script
468466
469467
### Release
470468
471-
We are satisfied about outcome analysis. A release can be useful...
469+
Once you are satisfied with the status of your analysis, it makes sense to create a release:
472470
473-
* ...for publications (DOI)
474-
* ...for code/software development
475-
* ...for course notes
471+
* For publications (DOI)
472+
* For code/software development versions
473+
* For course notes
476474
477-
[This tutorial](https://help.github.com/articles/creating-releases/) explains how to create a release.
475+
Follow [this tutorial](https://help.github.com/articles/creating-releases/) to create a release.
478476
479477
---
480478

0 commit comments

Comments
 (0)