summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@google.com>2018-12-19 11:39:39 +0100
committerPatrick Georgi <pgeorgi@google.com>2019-01-07 21:18:07 +0000
commit3c86293dc131cc36364f5b33ef75385f99c6db4c (patch)
tree066136ced8bbf6e0d872a9dcfd4324d94d47933f
parentb6fe0489100c7b57f36bafa2ed142d7dc1ce10ea (diff)
Documentation/gerrit: Update parts about WIP and draft commits
Gerrit dropped the "draft" concept and replaced it with private commits and work-in-progress commits, options that can be used independently from each other. Change-Id: I6abe267c2091c750fc234057be3a4e62adb59c4c Signed-off-by: Patrick Georgi <pgeorgi@google.com> Reviewed-on: https://review.coreboot.org/c/30309 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
-rw-r--r--Documentation/getting_started/gerrit_guidelines.md14
1 files changed, 9 insertions, 5 deletions
diff --git a/Documentation/getting_started/gerrit_guidelines.md b/Documentation/getting_started/gerrit_guidelines.md
index ba2b7b9d16..34104d8e55 100644
--- a/Documentation/getting_started/gerrit_guidelines.md
+++ b/Documentation/getting_started/gerrit_guidelines.md
@@ -159,15 +159,19 @@ this is by marking in the commit message that it’s not ready until X. The
commit message can be updated easily when it’s ready to be pushed.
Examples of this are "WIP: title" or "[NEEDS_TEST]: title". Another way to
mark the patch as not ready would be to give it a -1 or -2 review, but
-isn't as obvious as the commit message. These patches can also be pushed as
-drafts as shown in the next guideline.
+isn't as obvious as the commit message. These patches can also be pushed with
+the wip flag:
+ git push origin HEAD:refs/for/master%wip
* When pushing patches that are not for submission, these should be marked
as such. This can be done in the title ‘[DONOTSUBMIT]’, or can be pushed as
-draft commits, so that only explicitly added reviewers will see them. These
+private changes, so that only explicitly added reviewers will see them. These
sorts of patches are frequently posted as ideas or RFCs for the community
-to look at. To push a draft, use the command:
- git push origin HEAD:refs/for/master%private,wip
+to look at. To push a private change, use the command:
+ git push origin HEAD:refs/for/master%private
+
+* Multiple push options can be combined:
+ git push origin HEAD:refs/for/master%private,wip,topic=experiment
* Respond to anyone who has taken the time to review your patches, even if
it's just to say that you disagree. While it may seem annoying to address a