summaryrefslogtreecommitdiff
path: root/Documentation/contributing
diff options
context:
space:
mode:
authorStefan Reinauer <stefan.reinauer@coreboot.org>2023-09-14 12:47:26 -0700
committerStefan Reinauer <stefan.reinauer@coreboot.org>2023-09-15 18:42:46 +0000
commitb3f5d94f0957f20422e6095cf049808ddbb37520 (patch)
tree741062e61904cc49629d150eeb20020aeda8f5b4 /Documentation/contributing
parent0476f6aaabb6d682349879aacd0d2b7d8d719339 (diff)
Documentation: Adjust master -> main branch
Some of our documentation still points to the wrong branches Change-Id: Idb72e4f44f294f64eb01c588027d300a53d6fb41 Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/77875 Reviewed-by: Patrick Georgi <patrick@coreboot.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'Documentation/contributing')
-rw-r--r--Documentation/contributing/gerrit_guidelines.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/contributing/gerrit_guidelines.md b/Documentation/contributing/gerrit_guidelines.md
index c6f5fbfebf..9b0cc5f91e 100644
--- a/Documentation/contributing/gerrit_guidelines.md
+++ b/Documentation/contributing/gerrit_guidelines.md
@@ -234,7 +234,7 @@ be set when you push the patches into gerrit. For example, to push a set of
commits with the i915-kernel-x60 set, use the command:
```Bash
-git push origin HEAD:refs/for/master%topic=i915-kernel-x60
+git push origin HEAD:refs/for/main%topic=i915-kernel-x60
```
* If one of your patches isn't ready to be merged, make sure it's obvious
@@ -247,7 +247,7 @@ isn't as obvious as the commit message. These patches can also be pushed with
the wip flag:
```Bash
-git push origin HEAD:refs/for/master%wip
+git push origin HEAD:refs/for/main%wip
```
* When pushing patches that are not for submission, these should be marked
@@ -259,13 +259,13 @@ who knows their commit ID, so don't use this for sensitive changes. To push
a private change, use the command:
```Bash
-git push origin HEAD:refs/for/master%private
+git push origin HEAD:refs/for/main%private
```
* Multiple push options can be combined:
```Bash
-git push origin HEAD:refs/for/master%private,wip,topic=experiment
+git push origin HEAD:refs/for/main%private,wip,topic=experiment
```
* Respond to anyone who has taken the time to review your patches, even if
@@ -292,7 +292,7 @@ changed.
helps others and shows that these mainboards are currently being
maintained. At some point, boards that are not up to date in the
board-status repo will probably end up getting removed from the coreboot
-master branch.
+main branch.
* Abandon patches that are no longer useful, or that you don’t intend to
keep working on to get submitted.