Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Gitea instead of GitHub #3

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -75,13 +75,13 @@ episodes:
- 14-supplemental-rstudio.md

# Information for Learners
learners:
learners:

# Information for Instructors
instructors:
instructors:

# Learner Profiles
profiles:
profiles:

# Customisation ---------------------------------------------
#
Expand Down
21 changes: 3 additions & 18 deletions episodes/02-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -82,8 +72,6 @@ And on Windows:
$ git config --global core.autocrlf false
```

::::::::::::::::::::::::::::::::::::::::::::::::::

Dracula also has to set his favorite text editor, following this table:

| Editor | Configuration command |
Expand Down Expand Up @@ -138,7 +126,7 @@ the racist practice of human slavery and the
more inclusive language.

In 2020, most Git code hosting services transitioned to using `main` as the default
branch. As an example, any new repository that is opened in GitHub and GitLab default
branch. As an example, any new repository that is opened in GitHub, GitLab or Gitea default
to `main`. However, Git has not yet made the same change. As a result, local repositories
must be manually configured have the same main branch name as most cloud services.

Expand Down Expand Up @@ -213,9 +201,6 @@ $ 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.
Expand Down
Loading