diff options
author | Mike Frysinger <vapier@google.com> | 2020-11-15 18:42:26 -0500 |
---|---|---|
committer | Mike Frysinger <vapier@google.com> | 2020-11-16 05:07:33 +0000 |
commit | 6e89c965f40860f93389b919b4d7f190beb707f7 (patch) | |
tree | fa9d332ae2cdb27e6d46020a817dcdc5c349238f /docs/release-process.md | |
parent | 1f20776dbb3b87ba39928dc4baba58f9c2d17c80 (diff) | |
download | git-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/release-process.md')
-rw-r--r-- | docs/release-process.md | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/release-process.md b/docs/release-process.md index 0df590ac..43209eb0 100644 --- a/docs/release-process.md +++ b/docs/release-process.md | |||
@@ -97,7 +97,7 @@ If that tag cannot be verified, it gives up and forces the user to resolve. | |||
97 | 97 | ||
98 | ## Branch management | 98 | ## Branch management |
99 | 99 | ||
100 | All development happens on the `master` branch and should generally be stable. | 100 | All development happens on the `main` branch and should generally be stable. |
101 | 101 | ||
102 | Since the repo launcher defaults to tracking the `stable` branch, it is not | 102 | Since the repo launcher defaults to tracking the `stable` branch, it is not |
103 | normally updated until a new release is available. | 103 | normally updated until a new release is available. |
@@ -112,7 +112,7 @@ For example, when `stable` moves from `v1.10.x` to `v1.11.x`, then the `maint` | |||
112 | branch will be updated from `v1.9.x` to `v1.10.x`. | 112 | branch will be updated from `v1.9.x` to `v1.10.x`. |
113 | 113 | ||
114 | We don't have parallel release branches/series. | 114 | We don't have parallel release branches/series. |
115 | Typically all tags are made against the `master` branch and then pushed to the | 115 | Typically all tags are made against the `main` branch and then pushed to the |
116 | `stable` branch to make it available to the rest of the world. | 116 | `stable` branch to make it available to the rest of the world. |
117 | Since repo doesn't typically see a lot of changes, this tends to be OK. | 117 | Since repo doesn't typically see a lot of changes, this tends to be OK. |
118 | 118 | ||
@@ -120,10 +120,10 @@ Since repo doesn't typically see a lot of changes, this tends to be OK. | |||
120 | 120 | ||
121 | When you want to create a new release, you'll need to select a good version and | 121 | When you want to create a new release, you'll need to select a good version and |
122 | create a signed tag using a key registered in repo itself. | 122 | create a signed tag using a key registered in repo itself. |
123 | Typically we just tag the latest version of the `master` branch. | 123 | Typically we just tag the latest version of the `main` branch. |
124 | The tag could be pushed now, but it won't be used by clients normally (since the | 124 | The tag could be pushed now, but it won't be used by clients normally (since the |
125 | default `repo-rev` setting is `stable`). | 125 | default `repo-rev` setting is `stable`). |
126 | This would allow some early testing on systems who explicitly select `master`. | 126 | This would allow some early testing on systems who explicitly select `main`. |
127 | 127 | ||
128 | ### Creating a signed tag | 128 | ### Creating a signed tag |
129 | 129 | ||
@@ -144,7 +144,7 @@ $ export GNUPGHOME=~/.gnupg/repo/ | |||
144 | $ gpg -K | 144 | $ gpg -K |
145 | 145 | ||
146 | # Pick whatever branch or commit you want to tag. | 146 | # Pick whatever branch or commit you want to tag. |
147 | $ r=master | 147 | $ r=main |
148 | 148 | ||
149 | # Pick the new version. | 149 | # Pick the new version. |
150 | $ t=1.12.10 | 150 | $ t=1.12.10 |