aboutsummaryrefslogtreecommitdiff
path: root/HACKING
diff options
context:
space:
mode:
authorJerome Forissier <jerome.forissier@linaro.org>2018-12-14 16:31:17 +0100
committerTomas Vanek <vanekt@fbl.cz>2019-01-08 09:46:04 +0000
commit9388915dc62198b3653672584f81574bd94484a6 (patch)
treed9e09102d0b6ea2d8768188aa5a3e0e613260055 /HACKING
parenta6f5a167053fb2602f98671815f79d3382412d62 (diff)
HACKING: add note about refs/for/master
The fact that one needs to always push contributions to a single remote reference (refs/for/master) might seem odd to people unfamiliar with Gerrit. GitHub, for instance, hosts personal repositories where developers typically create topic branches for each contribution and use a proprietary mecanism to request a review (the "pull request"). More generally, one normally does not expect to be able to push non-fast-forwarding stuff to a remote branch. This commit adds a clarifying note to the patch guidelines. Change-Id: Ia750b815b82b18e92b6109c07f451000dcbecf9b Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org> Reviewed-on: http://openocd.zylin.com/4806 Tested-by: jenkins Reviewed-by: Christopher Head <chead@zaber.com> Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Diffstat (limited to 'HACKING')
-rw-r--r--HACKING4
1 files changed, 4 insertions, 0 deletions
diff --git a/HACKING b/HACKING
index 86bfde5f..39d98bb9 100644
--- a/HACKING
+++ b/HACKING
@@ -134,6 +134,10 @@ git config remote.review.push HEAD:refs/for/master
@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/