Skip to content

Commit

Permalink
docs: change suggested backport branch names
Browse files Browse the repository at this point in the history
  • Loading branch information
pro-wh committed May 10, 2022
1 parent ee484f0 commit 8933b07
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions .changelog/328.doc.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
docs: change suggested backport branch names
8 changes: 4 additions & 4 deletions docs/release-process.md
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,11 @@ export RELEASE_BRANCH="stable/1.5.x"

### Back-port Changes

Create a new branch, e.g. `${RELEASE_BRANCH}-backport-foo`, from the
Create a new branch, e.g. `yourgithubusername/${RELEASE_BRANCH}/foo`, from the
`${RELEASE_BRANCH}` branch:

```bash
git checkout -b ${RELEASE_BRANCH}-backport-foo ${RELEASE_BRANCH}
git checkout -b yourgithubusername/${RELEASE_BRANCH}/foo ${RELEASE_BRANCH}
```

After back-porting all the desired changes, push it to the origin and make a
Expand All @@ -182,11 +182,11 @@ As with a regular release, the back-ported changes should include the
corresponding [Change Log Fragments] that need to be assembled into a new
section of the [Change Log] using the `changelog` [Make] target.

Create a new branch, e.g. `${RELEASE_BRANCH}-changelog`, from the
Create a new branch, e.g. `yourgithubusername/${RELEASE_BRANCH}/changelog`, from the
`${RELEASE_BRANCH}` branch:

```bash
git checkout -b ${RELEASE_BRANCH}-changelog ${RELEASE_BRANCH}
git checkout -b yourgithubusername/${RELEASE_BRANCH}/changelog ${RELEASE_BRANCH}
```

Then run [Make]'s `changelog` target:
Expand Down

0 comments on commit 8933b07

Please sign in to comment.