Skip to content

Commit e0ebf46

Browse files
committed
Rename master branch to main
1 parent e787bc9 commit e0ebf46

File tree

7 files changed

+14
-14
lines changed

7 files changed

+14
-14
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44

55
To contribute to the docs, fork the composer/composer repository and add or
66
change a file in the doc directory. Documentation sources can be browsed
7-
at https://github.com/composer/composer/tree/master/doc
7+
at https://github.com/composer/composer/tree/main/doc
88

9-
Documentation is then automatically generated on getcomposer.org
9+
Documentation is then automatically generated on getcomposer.org

doc/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
All documentation sources are located at https://github.com/composer/composer/tree/master/doc
2-
and should be edited there directly.
1+
All documentation sources are located at https://github.com/composer/composer/tree/main/doc
2+
and should be edited there directly.

templates/doc.show.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<p class="fork-and-edit">
2323
Found a typo? Something is wrong in this documentation?
24-
<a href="https://github.com/composer/composer/edit/master/doc/{{ file }}"
24+
<a href="https://github.com/composer/composer/edit/main/doc/{{ file }}"
2525
title="Go to the docs to fork and propose updates (external link)"
2626
aria-label="Go to the docs to fork and propose updates (external link)">Fork and edit</a> it!
2727
</p>

templates/layout.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
{% endblock %}
5656

5757
<p class="license">
58-
Composer and all content on this site are released under the <a href="https://github.com/composer/composer/blob/master/LICENSE" title="View the MIT license (external link to GitHub.com)" aria-label="View the MIT license (external link to GitHub.com)">MIT license</a>.
58+
Composer and all content on this site are released under the <a href="https://github.com/composer/composer/blob/main/LICENSE" title="View the MIT license (external link to GitHub.com)" aria-label="View the MIT license (external link to GitHub.com)">MIT license</a>.
5959
</p>
6060
</footer>
6161
</div>

update-docs.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
cd vendor/composer/composer
4-
git checkout -q master
4+
git checkout -q main
55
git fetch -q origin
6-
git rebase -q origin/master > /dev/null
6+
git rebase -q origin/main > /dev/null
77
cd ../../..

update-site.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/bin/bash
22

33
git fetch -q origin || true
4-
diffs=$(git diff origin/master | wc -l)
4+
diffs=$(git diff origin/main | wc -l)
55

66
if [ "0" != "$diffs" ]
77
then
8-
git pull -q origin master || (git clean -qfd && git pull -q origin master)
8+
git pull -q origin main || (git clean -qfd && git pull -q origin main)
99
composer install -q
1010
fi

update.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ fi
6060

6161
cd "$root/$build"
6262

63-
# update master
63+
# update main
6464
git fetch -q origin
6565
git fetch --tags -q origin
66-
git checkout master -q --force
67-
git rebase -q origin/master > /dev/null
66+
git checkout main -q --force
67+
git rebase -q origin/main > /dev/null
6868

6969
version=`git log --pretty="%H" -n1 HEAD`
7070
touch "$root/$target/version"
@@ -113,7 +113,7 @@ for version in `git tag`; do
113113
fi
114114
done
115115

116-
git checkout master -q --force
116+
git checkout main -q --force
117117

118118
lastStableVersion=$(ls "$root/$target/download" | grep -E '^2\.[0-9.]+$' | xargs -I@ git log --format=format:"%ai @%n" -1 @ | sort -r | head -1 | awk '{print $4}')
119119
lastStableV1Version=$(ls "$root/$target/download" | grep -E '^1\.[0-9.]+$' | xargs -I@ git log --format=format:"%ai @%n" -1 @ | sort -r | head -1 | awk '{print $4}')

0 commit comments

Comments
 (0)