This is an automated email from the ASF dual-hosted git repository.
mattrpav pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-website.git
The following commit(s) were added to refs/heads/main by this push:
new df5658c [AMQ-8221] Update ActiveMQ Website and developer tools
references for 'master' to 'main' conversion
new 4c80aa0 Merge pull request #47 from mattrpav/AMQ-8221
df5658c is described below
commit df5658cfeef1c3c85c50b733c8a7aa8517942352
Author: Matt Pavlovich <[email protected]>
AuthorDate: Tue Apr 13 14:30:13 2021 -0500
[AMQ-8221] Update ActiveMQ Website and developer tools references for
'master' to 'main' conversion
---
README.md | 2 +-
scripts/checkout-PR.sh | 2 +-
scripts/merge-PR.sh | 8 ++++----
scripts/merge-branch.sh | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/README.md b/README.md
index c90aee6..5c5ff4e 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ Contributing to the site
If you would like to make a change to the ActiveMQ site:
1. Fork the [Apache ActiveMQ site
repository](https://github.com/apache/activemq-website) to your github account.
-2. Create a new branch from `master`
+2. Create a new branch from `main`
3. Test your changes locally
4. Add commit(s) to your branch
5. Open a pull request on the github mirror
diff --git a/scripts/checkout-PR.sh b/scripts/checkout-PR.sh
index 7f61fba..7f69b13 100755
--- a/scripts/checkout-PR.sh
+++ b/scripts/checkout-PR.sh
@@ -31,4 +31,4 @@ git fetch $ACTIVEMQWEB_GITHUB_REMOTE_NAME
git checkout $ACTIVEMQWEB_GITHUB_REMOTE_NAME/pr/$1 -B $1
-echo "\ndo your own rebase by typing: git pull --rebase
$ACTIVEMQWEB_APACHE_REMOTE_NAME master"
+echo "\ndo your own rebase by typing: git pull --rebase
$ACTIVEMQWEB_APACHE_REMOTE_NAME main"
diff --git a/scripts/merge-PR.sh b/scripts/merge-PR.sh
index 3d87bae..ed36dbc 100755
--- a/scripts/merge-PR.sh
+++ b/scripts/merge-PR.sh
@@ -29,7 +29,7 @@ set -e
# - apache being the apache origin::
https://gitbox.apache.org/repos/asf/activemq-ACTIVEMQWEB.git
#
# Notice: you should add +refs/pull/*/head to your fetch config on upstream
-# as specified on
https://github.com/apache/activemq-ACTIVEMQWEB/blob/master/docs/hacking-guide/en/maintainers.md
+# as specified on
https://github.com/apache/activemq-ACTIVEMQWEB/blob/main/docs/hacking-guide/en/maintainers.md
ACTIVEMQWEB_USER_REMOTE_NAME=${ACTIVEMQWEB_USER_REMOTE_NAME:-origin}
ACTIVEMQWEB_APACHE_REMOTE_NAME=${ACTIVEMQWEB_APACHE_REMOTE_NAME:-apache}
@@ -39,9 +39,9 @@ git fetch $ACTIVEMQWEB_USER_REMOTE_NAME
git fetch $ACTIVEMQWEB_APACHE_REMOTE_NAME
git fetch $ACTIVEMQWEB_GITHUB_REMOTE_NAME
-git checkout $ACTIVEMQWEB_APACHE_REMOTE_NAME/master -B master
+git checkout $ACTIVEMQWEB_APACHE_REMOTE_NAME/main -B main
git checkout $ACTIVEMQWEB_GITHUB_REMOTE_NAME/pr/$1 -B $1
-git pull --rebase $ACTIVEMQWEB_APACHE_REMOTE_NAME master
-git checkout master
+git pull --rebase $ACTIVEMQWEB_APACHE_REMOTE_NAME main
+git checkout main
git merge --no-ff $1 -m "This closes #$*"
git branch -D $1
diff --git a/scripts/merge-branch.sh b/scripts/merge-branch.sh
index e95fefd..e517e2a 100755
--- a/scripts/merge-branch.sh
+++ b/scripts/merge-branch.sh
@@ -33,8 +33,8 @@ git fetch $ACTIVEMQWEB_GITHUB_REMOTE_NAME
git checkout $1
-git pull --rebase $ACTIVEMQWEB_APACHE_REMOTE_NAME master
-git checkout $ACTIVEMQWEB_APACHE_REMOTE_NAME/master -B master
+git pull --rebase $ACTIVEMQWEB_APACHE_REMOTE_NAME main
+git checkout $ACTIVEMQWEB_APACHE_REMOTE_NAME/main -B main
git merge --no-ff $1 -m "This closes #$*"
git branch -D $1
