Skip to content

Commit acb9523

Browse files
vapierLUCI
authored and
LUCI
committed
SUBMITTING_PATCHES: update with commit queue details
Change-Id: I59dffb8524cb95b3fd4196bcecd18426f09bf9c4 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/373694 Tested-by: Mike Frysinger <[email protected]> Commit-Queue: Mike Frysinger <[email protected]> Reviewed-by: Gavin Mak <[email protected]>
1 parent 041f977 commit acb9523

File tree

1 file changed

+19
-14
lines changed

1 file changed

+19
-14
lines changed

SUBMITTING_PATCHES.md

+19-14
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1-
[TOC]
2-
3-
# Short Version
1+
# Submitting Changes
42

5-
- Make small logical changes.
6-
- [Provide a meaningful commit message][commit-message-style].
7-
- Make sure all code is under the Apache License, 2.0.
8-
- Publish your changes for review.
9-
- Make corrections if requested.
10-
- Verify your changes on gerrit so they can be submitted.
3+
Here's a short overview of the process.
114

12-
`git push https://gerrit-review.googlesource.com/git-repo HEAD:refs/for/main`
5+
* Make small logical changes.
6+
* [Provide a meaningful commit message][commit-message-style].
7+
* Make sure all code is under the Apache License, 2.0.
8+
* Publish your changes for review.
9+
* `git push origin HEAD:refs/for/main`
10+
* Make corrections if requested.
11+
* [Verify your changes on Gerrit.](#verify)
12+
* [Send to the commit queue for testing & merging.](#cq)
1313

14+
[TOC]
1415

15-
# Long Version
16+
## Long Version
1617

1718
I wanted a file describing how to submit patches for repo,
1819
so I started with the one found in the core Git distribution
@@ -174,12 +175,16 @@ commit. If you make the requested changes you will need to amend your commit
174175
and push it to the review server again.
175176

176177

177-
## Verify your changes on gerrit
178+
## Verify your changes on Gerrit {#verify}
178179

179180
After you receive a Code-Review+2 from the maintainer, select the Verified
180-
button on the gerrit page for the change. This verifies that you have tested
181+
button on the Gerrit page for the change. This verifies that you have tested
181182
your changes and notifies the maintainer that they are ready to be submitted.
182-
The maintainer will then submit your changes to the repository.
183183

184+
## Merge your changes via the commit queue {#cq}
185+
186+
Once a change is ready to be merged, select the Commit-Queue+2 setting on the
187+
Gerrit page for it. This tells the CI system to test the change, and if it
188+
passes all the checks, automatically merges it.
184189

185190
[commit-message-style]: https://chris.beams.io/posts/git-commit/

0 commit comments

Comments
 (0)