forked from swcarpentry/git-novice
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
10 changed files
with
411 additions
and
616 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 |
---|---|---|
|
@@ -58,14 +58,14 @@ contact: '[email protected]' | |
# - another-learner.md | ||
|
||
# Order of episodes in your lesson | ||
episodes: | ||
episodes: | ||
- 01-basics.md | ||
- 02-setup.md | ||
- 03-create.md | ||
- 04-changes.md | ||
- 05-history.md | ||
- 06-ignore.md | ||
- 07-github.md | ||
- 07-gitea.md | ||
- 08-collab.md | ||
- 09-conflict.md | ||
- 10-open.md | ||
|
@@ -75,13 +75,13 @@ episodes: | |
- 14-supplemental-rstudio.md | ||
|
||
# Information for Learners | ||
learners: | ||
learners: | ||
|
||
# Information for Instructors | ||
instructors: | ||
instructors: | ||
|
||
# Learner Profiles | ||
profiles: | ||
profiles: | ||
|
||
# Customisation --------------------------------------------- | ||
# | ||
|
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 |
---|---|---|
|
@@ -42,18 +42,8 @@ which means that any changes pushed to | |
another Git host server | ||
after this lesson will include this information. | ||
|
||
For this lesson, we will be interacting with [GitHub](https://github.com/) and so the email address used should be the same as the one used when setting up your GitHub account. If you are concerned about privacy, please review [GitHub's instructions for keeping your email address private][git-privacy]. | ||
|
||
::::::::::::::::::::::::::::::::::::::::: callout | ||
|
||
## Keeping your email private | ||
|
||
If you elect to use a private email address with GitHub, then use that same email address for the `user.email` value, e.g. `[email protected]` replacing `username` with your GitHub one. | ||
|
||
|
||
:::::::::::::::::::::::::::::::::::::::::::::::::: | ||
|
||
::::::::::::::::::::::::::::::::::::::::: callout | ||
For this lesson, we will be interacting with a [Gitea](http://carpentriesoffline.org:3000) instance. Gitea has a similar interface to [GitHub](https://github.com) | ||
and is running from the Raspberry Pi server. | ||
|
||
## Line Endings | ||
|
||
|
@@ -211,11 +201,6 @@ More generally, you can get the list of available `git` commands and further res | |
$ git help | ||
``` | ||
|
||
:::::::::::::::::::::::::::::::::::::::::::::::::: | ||
|
||
[git-privacy]: https://help.github.com/articles/keeping-your-email-address-private/ | ||
|
||
|
||
:::::::::::::::::::::::::::::::::::::::: keypoints | ||
|
||
- Use `git config` with the `--global` option to configure a user name, email address, editor, and other preferences once per machine. | ||
|
Oops, something went wrong.