Skip to content

Commit 7d58126

Browse files
authored
replace references to 'master' with 'main' (#1045)
Resolves #1039
1 parent 8786740 commit 7d58126

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ on:
33
# Run on all pull requests.
44

55
push:
6-
# Run on merges/pushes to master.
6+
# Run on merges/pushes to main.
77
branches:
8-
- master
8+
- main
99

1010
schedule:
1111
# Run nightly, at midnight.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<img width="350px" src="docs/artwork/draco3d-vert.svg" />
33
</p>
44

5-
[![draco-ci](https://github.com/google/draco/workflows/draco-ci/badge.svg?branch=master)](https://github.com/google/draco/actions/workflows/ci.yml)
5+
[![draco-ci](https://github.com/google/draco/workflows/draco-ci/badge.svg?branch=main)](https://github.com/google/draco/actions/workflows/ci.yml)
66

77
News
88
=======
@@ -611,6 +611,6 @@ References
611611
[meshes]: https://en.wikipedia.org/wiki/Polygon_mesh
612612
[point clouds]: https://en.wikipedia.org/wiki/Point_cloud
613613
[Bunny]: https://graphics.stanford.edu/data/3Dscanrep/
614-
[CONTRIBUTING]: https://raw.githubusercontent.com/google/draco/master/CONTRIBUTING.md
614+
[CONTRIBUTING]: https://raw.githubusercontent.com/google/draco/main/CONTRIBUTING.md
615615

616616
Bunny model from Stanford's graphic department <https://graphics.stanford.edu/data/3Dscanrep/>

docs/_layouts/home.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
<ul class="nav navbar-nav">
6464
<li><a href="https://github.com/google/draco">Github</a></li>
6565
<li><a href="https://storage.googleapis.com/demos.webmproject.org/draco/draco_loader_throw.html">Demo</a></li>
66-
<li><a href="https://github.com/google/draco/tree/master/javascript/example">Example</a></li>
66+
<li><a href="https://github.com/google/draco/tree/main/javascript/example">Example</a></li>
6767
<li class="dropdown">
6868
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Spec <span class="caret"></span></a>
6969
<ul class="dropdown-menu">

docs/_layouts/spec-page.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<ul class="nav navbar-nav">
7979
<li><a href="https://github.com/google/draco">Github</a></li>
8080
<li><a href="https://storage.googleapis.com/demos.webmproject.org/draco/draco_loader_throw.html">Demo</a></li>
81-
<li><a href="https://github.com/google/draco/tree/master/javascript/example">Example</a></li>
81+
<li><a href="https://github.com/google/draco/tree/main/javascript/example">Example</a></li>
8282
<li class="dropdown">
8383
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Spec <span class="caret"></span></a>
8484
<ul class="dropdown-menu">
@@ -116,4 +116,4 @@
116116
<script src="{{ 'assets/js/ie10-viewport-bug-workaround.js' | relative_url }}"></script>
117117
{% include analytics.html %}
118118
</body>
119-
</html>
119+
</html>

docs/spec/README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -112,23 +112,23 @@ $ git remote show origin
112112
* remote origin
113113
Fetch URL: [email protected]:<username>/draco.git
114114
Push URL: [email protected]:<username>/draco.git
115-
HEAD branch: master
115+
HEAD branch: main
116116
Remote branch:
117-
master tracked
117+
main tracked
118118
Local branch configured for 'git pull':
119-
master merges with remote master
119+
main merges with remote main
120120
Local ref configured for 'git push':
121-
master pushes to master (up to date)
121+
main pushes to main (up to date)
122122
123123
$ git remote show upstream
124124
* remote upstream
125125
Fetch URL: [email protected]:google/draco.git
126126
Push URL: [email protected]:google/draco.git
127-
HEAD branch: master
127+
HEAD branch: main
128128
Remote branch:
129-
master tracked
129+
main tracked
130130
Local ref configured for 'git push':
131-
master pushes to master (up to date)
131+
main pushes to main (up to date)
132132
~~~~~
133133

134134
[**See this page**][1] for a longer discussion of managing remotes and general
@@ -242,13 +242,13 @@ Next, visit the `upstream` [homepage]. If you are logged-in, GitHub will be
242242
aware of your recently pushed branch, and offer an in-page widget for submitting
243243
a pull request for the project maintainers to consider.
244244

245-
Once your pull request is merged into upstream's master branch, you may
245+
Once your pull request is merged into upstream's main branch, you may
246246
synchronize your clone (and remote `origin`) as follows:
247247

248248
~~~~~
249-
git co master
249+
git co main
250250
git fetch upstream
251-
git merge upstream/master
251+
git merge upstream/main
252252
git push origin
253253
~~~~~
254254

javascript/npm/draco3d/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
<p align="center">
3-
<img src="https://github.com/google/draco/raw/master/docs/DracoLogo.jpeg" />
3+
<img src="https://github.com/google/draco/raw/main/docs/DracoLogo.jpeg" />
44
</p>
55

66
News

javascript/npm/draco3dgltf/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
<p align="center">
3-
<img src="https://github.com/google/draco/raw/master/docs/DracoLogo.jpeg" />
3+
<img src="https://github.com/google/draco/raw/main/docs/DracoLogo.jpeg" />
44
</p>
55

66
Description - glTF Draco Mesh Compression Extension

0 commit comments

Comments
 (0)