From fcaac0b18a6cbfc50d26c992316a0b7bbe0a62ed Mon Sep 17 00:00:00 2001 From: AkiraFukushima Date: Wed, 11 Nov 2020 23:09:14 +0900 Subject: [PATCH] Fix default branch name in description of bootstrap_github Signed-off-by: AkiraFukushima --- cmd/flux/bootstrap_github.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/flux/bootstrap_github.go b/cmd/flux/bootstrap_github.go index 5565a98a..9aa2bef9 100644 --- a/cmd/flux/bootstrap_github.go +++ b/cmd/flux/bootstrap_github.go @@ -35,7 +35,7 @@ var bootstrapGitHubCmd = &cobra.Command{ Use: "github", Short: "Bootstrap toolkit components in a GitHub repository", Long: `The bootstrap github command creates the GitHub repository if it doesn't exists and -commits the toolkit components manifests to the master branch. +commits the toolkit components manifests to the main branch. Then it configures the target cluster to synchronize with the repository. If the toolkit components are present on the cluster, the bootstrap command will perform an upgrade if needed.`, @@ -52,7 +52,7 @@ the bootstrap command will perform an upgrade if needed.`, flux bootstrap github --owner= --repository= --path=dev-cluster # Run bootstrap for a public repository on a personal account - flux bootstrap github --owner= --repository= --private=false --personal=true + flux bootstrap github --owner= --repository= --private=false --personal=true # Run bootstrap for a private repo hosted on GitHub Enterprise flux bootstrap github --owner= --repository= --hostname= @@ -155,7 +155,7 @@ func bootstrapGitHubCmdRun(cmd *cobra.Command, args []string) error { } } - // clone repository and checkout the master branch + // clone repository and checkout the main branch if err := repository.Checkout(ctx, bootstrapBranch, tmpDir); err != nil { return err }