From 5f7aa4120061919e2993fed733f2973fa4232703 Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Tue, 13 May 2025 12:43:28 -0700 Subject: [PATCH] docs: add cherry-pick range example in release steps Signed-off-by: Arko Dasgupta --- site/content/en/contributions/RELEASING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/content/en/contributions/RELEASING.md b/site/content/en/contributions/RELEASING.md index bdd6b46681..fc4d77121e 100644 --- a/site/content/en/contributions/RELEASING.md +++ b/site/content/en/contributions/RELEASING.md @@ -173,7 +173,7 @@ export GITHUB_REMOTE=origin 6. If the tip of the release branch does not match the tip of `main`, perform the following: 1. Create a topic branch from the release branch. - 2. Cherry-pick the commits from `main` that differ from the release branch. + 2. Cherry-pick the commits from `main` that differ from the release branch, e.g. `git cherry-pick .. -s` 3. Run tests locally, e.g. `make lint`. 4. Sign, commit, and push your topic branch to your Envoy Gateway fork. 5. Submit a PR to merge the topic from of your fork into the Envoy Gateway release branch.