Skip to content

Commit 29223ba

Browse files
committed
Migrate from master to main
1 parent 6f5dab8 commit 29223ba

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

.github/ISSUE_TEMPLATE/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
blank_issues_enabled: false
22
contact_links:
33
- name: Translation bug
4-
url: https://github.com/progit/progit2/blob/master/TRANSLATING.md
4+
url: https://github.com/progit/progit2/blob/main/TRANSLATING.md
55
about: Refer to this table to find out where to report translation bugs.
66

77
- name: Report bugs for git-scm.com site

.github/pull_request_template.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- Should your changes appear in a printed edition, you'll be included in the contributors list. -->
44

55
<!-- Mark the checkbox [X] or [x] if you agree with the item. -->
6-
- [ ] I provide my work under the [project license](https://github.com/progit/progit2/blob/master/LICENSE.asc).
6+
- [ ] I provide my work under the [project license](https://github.com/progit/progit2/blob/main/LICENSE.asc).
77
- [ ] I grant such license of my work as is required for the purposes of future print editions to [Ben Straub](https://github.com/ben) and [Scott Chacon](https://github.com/schacon).
88

99
## Changes

.github/workflows/pr-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Pull Request Build
22

33
on:
44
pull_request:
5-
branches: [ master ]
5+
branches: [ main ]
66

77
jobs:
88
build:

.github/workflows/release-on-merge.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
name: Release on push to master
1+
name: Release on push to main
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ main ]
66

77
jobs:
88
release:
@@ -34,5 +34,5 @@ jobs:
3434
with:
3535
token: ${{ secrets.GITHUB_TOKEN }}
3636
tag: ${{ steps.compute-tag.outputs.tagname }}
37-
commit: master
37+
commit: main
3838
artifacts: './progit.epub,./progit.mobi,./progit.pdf,./progit.html'

TRANSLATING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ On https://git-scm.com, the translations are divided into three categories. Once
7676

7777
GitHub Actions is a [continuous integration](https://en.wikipedia.org/wiki/Continuous_integration) service that integrates with GitHub. GitHub Actions is used to ensure that a pull-request doesn't break the build or compilation. GitHub Actions can also provide compiled versions of the book.
7878

79-
The configuration for GitHub Actions is contained in the `.github/workflows` directory, and if you bring in the `master` branch of the root repository you'll get them for free.
79+
The configuration for GitHub Actions is contained in the `.github/workflows` directory, and if you bring in the `main` branch of the root repository you'll get them for free.
8080
However, if you created your translation repo by _forking_ the root repo, there's an extra step you must complete (if you did not fork, you can skip this part).
8181
GitHub assumes that forks will be used to contribute to the repo from which they were forked, so you'll have to visit the "Actions" tab on your forked repo, and click the "I understand my workflows" button to allow the actions to run.
8282

atlas.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"branch": "master",
2+
"branch": "main",
33
"files": [
44
"book/cover.html",
55
"LICENSE.asc",

0 commit comments

Comments
 (0)