replace references to 'master' with 'main' (#1045)

Resolves #1039
This commit is contained in:
James Zern 2024-02-06 12:20:40 -08:00 committed by GitHub
parent 8786740086
commit 7d58126d07
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 19 additions and 19 deletions

View File

@ -3,9 +3,9 @@ on:
# Run on all pull requests.
push:
# Run on merges/pushes to master.
# Run on merges/pushes to main.
branches:
- master
- main
schedule:
# Run nightly, at midnight.

View File

@ -2,7 +2,7 @@
<img width="350px" src="docs/artwork/draco3d-vert.svg" />
</p>
[![draco-ci](https://github.com/google/draco/workflows/draco-ci/badge.svg?branch=master)](https://github.com/google/draco/actions/workflows/ci.yml)
[![draco-ci](https://github.com/google/draco/workflows/draco-ci/badge.svg?branch=main)](https://github.com/google/draco/actions/workflows/ci.yml)
News
=======
@ -611,6 +611,6 @@ References
[meshes]: https://en.wikipedia.org/wiki/Polygon_mesh
[point clouds]: https://en.wikipedia.org/wiki/Point_cloud
[Bunny]: https://graphics.stanford.edu/data/3Dscanrep/
[CONTRIBUTING]: https://raw.githubusercontent.com/google/draco/master/CONTRIBUTING.md
[CONTRIBUTING]: https://raw.githubusercontent.com/google/draco/main/CONTRIBUTING.md
Bunny model from Stanford's graphic department <https://graphics.stanford.edu/data/3Dscanrep/>

View File

@ -63,7 +63,7 @@
<ul class="nav navbar-nav">
<li><a href="https://github.com/google/draco">Github</a></li>
<li><a href="https://storage.googleapis.com/demos.webmproject.org/draco/draco_loader_throw.html">Demo</a></li>
<li><a href="https://github.com/google/draco/tree/master/javascript/example">Example</a></li>
<li><a href="https://github.com/google/draco/tree/main/javascript/example">Example</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Spec <span class="caret"></span></a>
<ul class="dropdown-menu">

View File

@ -78,7 +78,7 @@
<ul class="nav navbar-nav">
<li><a href="https://github.com/google/draco">Github</a></li>
<li><a href="https://storage.googleapis.com/demos.webmproject.org/draco/draco_loader_throw.html">Demo</a></li>
<li><a href="https://github.com/google/draco/tree/master/javascript/example">Example</a></li>
<li><a href="https://github.com/google/draco/tree/main/javascript/example">Example</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Spec <span class="caret"></span></a>
<ul class="dropdown-menu">
@ -116,4 +116,4 @@
<script src="{{ 'assets/js/ie10-viewport-bug-workaround.js' | relative_url }}"></script>
{% include analytics.html %}
</body>
</html>
</html>

View File

@ -112,23 +112,23 @@ $ git remote show origin
* remote origin
Fetch URL: git@github.com:<username>/draco.git
Push URL: git@github.com:<username>/draco.git
HEAD branch: master
HEAD branch: main
Remote branch:
master tracked
main tracked
Local branch configured for 'git pull':
master merges with remote master
main merges with remote main
Local ref configured for 'git push':
master pushes to master (up to date)
main pushes to main (up to date)
$ git remote show upstream
* remote upstream
Fetch URL: git@github.com:google/draco.git
Push URL: git@github.com:google/draco.git
HEAD branch: master
HEAD branch: main
Remote branch:
master tracked
main tracked
Local ref configured for 'git push':
master pushes to master (up to date)
main pushes to main (up to date)
~~~~~
[**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
aware of your recently pushed branch, and offer an in-page widget for submitting
a pull request for the project maintainers to consider.
Once your pull request is merged into upstream's master branch, you may
Once your pull request is merged into upstream's main branch, you may
synchronize your clone (and remote `origin`) as follows:
~~~~~
git co master
git co main
git fetch upstream
git merge upstream/master
git merge upstream/main
git push origin
~~~~~

View File

@ -1,6 +1,6 @@
<p align="center">
<img src="https://github.com/google/draco/raw/master/docs/DracoLogo.jpeg" />
<img src="https://github.com/google/draco/raw/main/docs/DracoLogo.jpeg" />
</p>
News

View File

@ -1,6 +1,6 @@
<p align="center">
<img src="https://github.com/google/draco/raw/master/docs/DracoLogo.jpeg" />
<img src="https://github.com/google/draco/raw/main/docs/DracoLogo.jpeg" />
</p>
Description - glTF Draco Mesh Compression Extension