diff options
author | Tim Newsome <tim@sifive.com> | 2019-02-08 14:39:47 -0800 |
---|---|---|
committer | Tim Newsome <tim@sifive.com> | 2019-02-08 14:39:47 -0800 |
commit | 1c6d52cd88076cf22e55e0294cbb9751a3492470 (patch) | |
tree | aaa36ec90b01caccadfe2c07932f2a22e3967d0c /HACKING | |
parent | 80ef54dba2411f9354b3793d5832c5d8ad871b4b (diff) | |
parent | 6c2020eb48803b941a94d600e2a96728d05a7da9 (diff) | |
download | riscv-openocd-1c6d52cd88076cf22e55e0294cbb9751a3492470.zip riscv-openocd-1c6d52cd88076cf22e55e0294cbb9751a3492470.tar.gz riscv-openocd-1c6d52cd88076cf22e55e0294cbb9751a3492470.tar.bz2 |
Merge branch 'master' into from_upstream
Conflicts:
README
contrib/loaders/flash/fespi/Makefile
src/flash/nor/fespi.c
src/flash/nor/spi.c
Change-Id: I78a4e73685cc95daace95e9d16066a6fb51034fb
Diffstat (limited to 'HACKING')
-rw-r--r-- | HACKING | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -148,18 +148,22 @@ to instruct git locally how to send off the changes. -# Add a new remote to git using Gerrit username: @code git remote add review ssh://USERNAME@openocd.zylin.com:29418/openocd.git -git config remote.review.push HEAD:refs/publish/master +git config remote.review.push HEAD:refs/for/master @endcode Or with http only: @code git remote add review http://USERNAME@openocd.zylin.com/p/openocd.git -git config remote.review.push HEAD:refs/publish/master +git config remote.review.push HEAD:refs/for/master @endcode The http password is configured from your gerrit settings - http://openocd.zylin.com/#/settings/http-password. \note If you want to simplify http access you can also add your http password to the url as follows: @code git remote add review http://USERNAME:PASSWORD@openocd.zylin.com/p/openocd.git @endcode + \note All contributions should be pushed to @c refs/for/master on the +Gerrit server, even if you plan to use several local branches for different +topics. It is possible because @c for/master is not a traditional Git +branch. -# You will need to install this hook, we will look into a better solution: @code scp -p -P 29418 USERNAME@openocd.zylin.com:hooks/commit-msg .git/hooks/ |