From 331c722dd73ff5902c76092f31ce1936b64643a1 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Sat, 26 Dec 2015 13:33:09 -0700 Subject: 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 Reviewed-on: https://review.coreboot.org/12804 Tested-by: build bot (Jenkins) Reviewed-by: Alexandru Gagniuc Reviewed-by: Patrick Georgi --- Documentation/gerrit_guidelines.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'Documentation/gerrit_guidelines.md') 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: -------------------------------------- -- cgit v1.2.3