openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-26 22:52:34 +02:00
Code Issues Releases Wiki Activity

tree: Rename master branch to main

Browse Source 
Change-Id: I8f4a377735f3f6ab4a22006949ff294a218bdf22
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Signed-off-by: Anastasia Klimchuk <aklm@flashrom.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/75706
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
This commit is contained in:
Stefan Reinauer 2023-06-10 10:29:47 -07:00
parent 9ccbf1cf43
commit 0fba888398
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/dev_guide/development_guide.rst
View File

@ -32,7 +32,7 @@ Set up the git repository and dev environment
* If using https: :code:`git remote add -f upstream https://review.coreboot.org/flashrom`
* If using ssh: :code:`git remote add -f upstream ssh://<gerrit_username>@review.coreboot.org:29418/flashrom`
#. Check out a new local branch that tracks :code:`upstream/master`: :code:`git checkout -b <branch_name> upstream/master`
#. Check out a new local branch that tracks :code:`upstream/main`: :code:`git checkout -b <branch_name> upstream/main`
#. Every patch is required to be signed-off (see also :ref:`sign-off`).
Set up your ``user.name`` and ``user.email`` in git config, and don't forget
@ -191,7 +191,7 @@ Creating an account
Pushing a patch
---------------
To push patch to Gerrit, use the follow command: :code:`git push upstream HEAD:refs/for/master`.
To push patch to Gerrit, use the follow command: :code:`git push upstream HEAD:refs/for/main`.
* If using HTTPS you will be prompted for the username and password you
set in the Gerrit UI.
@ -205,7 +205,7 @@ to a certain topic.
Adding a topic makes it easy to search "all the patches by the topic", even if the patches
have been authored by multiple people.
To add a topic, push with the command: :code:`git push upstream HEAD:refs/for/master%topic=example_topic`.
To add a topic, push with the command: :code:`git push upstream HEAD:refs/for/main%topic=example_topic`.
Alternatively, you can add a topic from a Gerrit UI after the patch in pushed
(on the top-left section) of patch UI.

2
util/manibuilder/Makefile
View File

@ -56,7 +56,7 @@ $(ALL_TAGS): %: %-check-build
--env IDENT=$(call ident,$*) \
--volume manicache:/home/mani/.ccache \
--name mani_$(call ident,$*) mani/$* \
"git fetch origin $${TEST_REVISION:-master} && \
"git fetch origin $${TEST_REVISION:-main} && \
git checkout FETCH_HEAD && \
$(MAKECMD) clean && $(MAKECMD) -j$${CPUS:-1} CC='$(CC)' \
$(if $(STRIP),STRIP='$(STRIP)') \

2
util/manibuilder/README.md
View File

@ -38,7 +38,7 @@ Usage example
-------------
The most common use case may be testing the current upstream
*master* branch which is the default for `$(TEST_REVISION)`.
*main* branch which is the default for `$(TEST_REVISION)`.
You'll need roughly 20GiB for the *Docker* images. Might look
like this: