From 6e89c965f40860f93389b919b4d7f190beb707f7 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 15 Nov 2020 18:42:26 -0500 Subject: switch to "main" branch for development We're migrating from "master" to "main" as the default development branch. This only affects repo itself, not manifests. Change-Id: I27489dd721c9a467a1c43736808cb3b3c1365433 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/288082 Reviewed-by: Michael Mortensen Tested-by: Mike Frysinger --- docs/manifest-format.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'docs/manifest-format.md') diff --git a/docs/manifest-format.md b/docs/manifest-format.md index 676e031d..b35a065f 100644 --- a/docs/manifest-format.md +++ b/docs/manifest-format.md @@ -142,8 +142,8 @@ Attribute `review`: Hostname of the Gerrit server where reviews are uploaded to by `repo upload`. This attribute is optional; if not specified then `repo upload` will not function. -Attribute `revision`: Name of a Git branch (e.g. `master` or -`refs/heads/master`). Remotes with their own revision will override +Attribute `revision`: Name of a Git branch (e.g. `main` or +`refs/heads/main`). Remotes with their own revision will override the default revision. ### Element default @@ -156,11 +156,11 @@ Attribute `remote`: Name of a previously defined remote element. Project elements lacking a remote attribute of their own will use this remote. -Attribute `revision`: Name of a Git branch (e.g. `master` or -`refs/heads/master`). Project elements lacking their own +Attribute `revision`: Name of a Git branch (e.g. `main` or +`refs/heads/main`). Project elements lacking their own revision attribute will use this revision. -Attribute `dest-branch`: Name of a Git branch (e.g. `master`). +Attribute `dest-branch`: Name of a Git branch (e.g. `main`). Project elements not setting their own `dest-branch` will inherit this value. If this value is not set, projects will use `revision` by default instead. @@ -247,13 +247,13 @@ If not supplied the remote given by the default element is used. Attribute `revision`: Name of the Git branch the manifest wants to track for this project. Names can be relative to refs/heads -(e.g. just "master") or absolute (e.g. "refs/heads/master"). +(e.g. just "main") or absolute (e.g. "refs/heads/main"). Tags and/or explicit SHA-1s should work in theory, but have not been extensively tested. If not supplied the revision given by the remote element is used if applicable, else the default element is used. -Attribute `dest-branch`: Name of a Git branch (e.g. `master`). +Attribute `dest-branch`: Name of a Git branch (e.g. `main`). When using `repo upload`, changes will be submitted for code review on this branch. If unspecified both here and in the default element, `revision` is used instead. -- cgit v1.2.3-54-g00ecf