diff --git a/README.md b/README.md index e5911c0..727a44c 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Or curl the bootstrap script, which will create the `workspace` directory and cl This is primarily intended for quickly setting up virtual workstations. ``` -bash <(curl -s https://raw.githubusercontent.com/cloudfoundry/capi-workspace/master/bootstrap.sh) +bash <(curl -s https://raw.githubusercontent.com/cloudfoundry/capi-workspace/main/bootstrap.sh) ``` **Make sure you ssh in as the "pivotal" user** diff --git a/assets/gitconfig b/assets/gitconfig index a49991c..56089e2 100644 --- a/assets/gitconfig +++ b/assets/gitconfig @@ -1,5 +1,5 @@ [alias] - blog = "loga origin/master... --left-right" + blog = "loga origin/main... --left-right" br = branch ci = commit --verbose co = checkout @@ -15,8 +15,8 @@ lol = "log --graph --decorate --oneline" lola = "log --graph --decorate --oneline --all" ri = rebase --interactive - rio = rebase --interactive origin/master - rum = "rebase master@{u}" + rio = rebase --interactive origin/main + rum = "rebase main@{u}" s = status --short --branch solo = author pair = author diff --git a/bin/git-open b/bin/git-open index de056e9..72a87c5 100755 --- a/bin/git-open +++ b/bin/git-open @@ -240,8 +240,8 @@ openurl="$protocol://$domain/$urlpath" if (( is_commit )); then sha=$(git rev-parse HEAD) openurl="$openurl/commit/$sha" -elif [[ $remote_ref != "master" ]]; then - # simplify URL for master +elif [[ $remote_ref != "main" ]]; then + # simplify URL for main openurl="$openurl$providerBranchRef" fi diff --git a/bin/which_capi b/bin/which_capi index 3713983..d3c694d 100755 --- a/bin/which_capi +++ b/bin/which_capi @@ -62,7 +62,7 @@ function first_release_with_sha { function display_pre_release_branches_with_sha { declare search_sha=$1 - declare -a branches=("origin/ci-passed" "origin/master" "origin/develop") + declare -a branches=("origin/ci-passed" "origin/main" "origin/develop") local branch local result diff --git a/bootstrap.sh b/bootstrap.sh index e2b7dd5..1dcd68f 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,6 +1,6 @@ #!/bin/bash # run this script on newly provisions VMs to create remote workstations -# bash <(curl -s https://raw.githubusercontent.com/cloudfoundry/capi-workspace/master/bootstrap.sh) +# bash <(curl -s https://raw.githubusercontent.com/cloudfoundry/capi-workspace/main/bootstrap.sh) mkdir -p ~/workspace cd ~/workspace