summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Roth <martinroth@google.com>2015-12-26 13:33:09 -0700
committerMartin Roth <martinroth@google.com>2016-01-06 17:41:13 +0100
commit331c722dd73ff5902c76092f31ce1936b64643a1 (patch)
treeedce5eed3c4b79700d98e90cac232bc3ef6bc1be
parent272a1f05b943d781acb8c04c01874bde9df3b774 (diff)
downloadcoreboot-331c722dd73ff5902c76092f31ce1936b64643a1.tar.xz
Documentation: Add information about patches from other git repos
This is more tribal knowledge that I don't think I've seen written down anywhere else. It's not a huge issue, but when looking through the git log, it helps to be able to differentiate the information from the old gerrit with the information from the new one. Change-Id: I7993bda1e9aab79dc26940aaba9ddc52382ed0df Signed-off-by: Martin Roth <martinroth@google.com> Reviewed-on: https://review.coreboot.org/12804 Tested-by: build bot (Jenkins) Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
-rw-r--r--Documentation/gerrit_guidelines.md14
1 files changed, 14 insertions, 0 deletions
diff --git a/Documentation/gerrit_guidelines.md b/Documentation/gerrit_guidelines.md
index 3140ff5eae..1833b0a8f0 100644
--- a/Documentation/gerrit_guidelines.md
+++ b/Documentation/gerrit_guidelines.md
@@ -236,6 +236,20 @@ request. For major problems where the change doesn’t work as intended or
breaks other platforms, the change really needs to go into the original
patch.
+* When bringing in a patch from another git repo, update the original
+git/gerrit tags by prepending the lines with 'Original-'. Marking
+the original text this way makes it much easier to tell what changes
+happened in which repository. This applies to these lines, not the actual
+commit message itself:
+ Commit-Id:
+ Change-Id:
+ Signed-off-by:
+ Reviewed-on:
+ Tested-by:
+ Reviewed-by:
+The script 'util/gitconfig/rebase.sh' can be used to help automate this.
+Other tags such as 'Commit-Queue' can simply be removed.
+
Expectations contributors should have:
--------------------------------------