X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=HACKING;h=39d98bb96edc1a7f16fe2a7ff9b60e28dfd8aab0;hp=0d24957e141268a997274cdbb4ca0e4394e6968a;hb=42bc2051aa5528a26a2c24f0d76cbb63d399c7c0;hpb=6e356cbfe27c1718d784f7aa36efb483a523fb64

diff --git a/HACKING b/HACKING
index 0d24957e14..39d98bb96e 100644
--- a/HACKING
+++ b/HACKING
@@ -122,18 +122,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/
@@ -201,7 +205,7 @@ Further reading: http://www.coreboot.org/Git
 
 The code review is intended to take as long as a week or two to allow
 maintainers and contributors who work on OpenOCD only in their spare
-time oportunity to perform a review and raise objections.
+time opportunity to perform a review and raise objections.
 
 With Gerrit much of the urgency of getting things committed has been
 removed as the work in progress is safely stored in Gerrit and