summaryrefslogtreecommitdiffstats
path: root/docs/manifest-format.md
diff options
context:
space:
mode:
authorMike Frysinger <vapier@google.com>2020-11-15 18:42:26 -0500
committerMike Frysinger <vapier@google.com>2020-11-16 05:07:33 +0000
commit6e89c965f40860f93389b919b4d7f190beb707f7 (patch)
treefa9d332ae2cdb27e6d46020a817dcdc5c349238f /docs/manifest-format.md
parent1f20776dbb3b87ba39928dc4baba58f9c2d17c80 (diff)
downloadgit-repo-6e89c965f40860f93389b919b4d7f190beb707f7.tar.gz
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 <mmortensen@google.com> Tested-by: Mike Frysinger <vapier@google.com>
Diffstat (limited to 'docs/manifest-format.md')
-rw-r--r--docs/manifest-format.md14
1 files changed, 7 insertions, 7 deletions
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
142are uploaded to by `repo upload`. This attribute is optional; 142are uploaded to by `repo upload`. This attribute is optional;
143if not specified then `repo upload` will not function. 143if not specified then `repo upload` will not function.
144 144
145Attribute `revision`: Name of a Git branch (e.g. `master` or 145Attribute `revision`: Name of a Git branch (e.g. `main` or
146`refs/heads/master`). Remotes with their own revision will override 146`refs/heads/main`). Remotes with their own revision will override
147the default revision. 147the default revision.
148 148
149### Element default 149### Element default
@@ -156,11 +156,11 @@ Attribute `remote`: Name of a previously defined remote element.
156Project elements lacking a remote attribute of their own will use 156Project elements lacking a remote attribute of their own will use
157this remote. 157this remote.
158 158
159Attribute `revision`: Name of a Git branch (e.g. `master` or 159Attribute `revision`: Name of a Git branch (e.g. `main` or
160`refs/heads/master`). Project elements lacking their own 160`refs/heads/main`). Project elements lacking their own
161revision attribute will use this revision. 161revision attribute will use this revision.
162 162
163Attribute `dest-branch`: Name of a Git branch (e.g. `master`). 163Attribute `dest-branch`: Name of a Git branch (e.g. `main`).
164Project elements not setting their own `dest-branch` will inherit 164Project elements not setting their own `dest-branch` will inherit
165this value. If this value is not set, projects will use `revision` 165this value. If this value is not set, projects will use `revision`
166by default instead. 166by default instead.
@@ -247,13 +247,13 @@ If not supplied the remote given by the default element is used.
247 247
248Attribute `revision`: Name of the Git branch the manifest wants 248Attribute `revision`: Name of the Git branch the manifest wants
249to track for this project. Names can be relative to refs/heads 249to track for this project. Names can be relative to refs/heads
250(e.g. just "master") or absolute (e.g. "refs/heads/master"). 250(e.g. just "main") or absolute (e.g. "refs/heads/main").
251Tags and/or explicit SHA-1s should work in theory, but have not 251Tags and/or explicit SHA-1s should work in theory, but have not
252been extensively tested. If not supplied the revision given by 252been extensively tested. If not supplied the revision given by
253the remote element is used if applicable, else the default 253the remote element is used if applicable, else the default
254element is used. 254element is used.
255 255
256Attribute `dest-branch`: Name of a Git branch (e.g. `master`). 256Attribute `dest-branch`: Name of a Git branch (e.g. `main`).
257When using `repo upload`, changes will be submitted for code 257When using `repo upload`, changes will be submitted for code
258review on this branch. If unspecified both here and in the 258review on this branch. If unspecified both here and in the
259default element, `revision` is used instead. 259default element, `revision` is used instead.