[ovs-dev] [PATCH] committer-responsibilities: Add guidelines for fixing up mistakes.

Ben Pfaff blp at ovn.org
Wed Jul 24 17:05:41 UTC 2019


Signed-off-by: Ben Pfaff <blp at ovn.org>
---
Based on an off-lst discussion with Ilya.  This is just my first, off-hand
thought on the topic.  Feedback welcome!

diff --git a/Documentation/internals/committer-responsibilities.rst b/Documentation/internals/committer-responsibilities.rst
index 4d10c3980875..b34dddaa99fd 100644
--- a/Documentation/internals/committer-responsibilities.rst
+++ b/Documentation/internals/committer-responsibilities.rst
@@ -94,3 +94,9 @@ Use Reported-by: and Tested-by: tags in commit messages to indicate the
 source of a bug report.
 
 Keep the ``AUTHORS.rst`` file up to date.
+
+If you mistakenly push a commit that should not have been applied, it's OK to
+use a Git "force-push" to remove it from the tree, as long as you do it within
+a few minutes and no one has pushed other commits to the tree in the meantime.
+Otherwise, it's necessary to revert the commit.  (If you do this frequently,
+more than once or twice a year, then maybe you should be more careful.)
-- 
2.20.1



More information about the dev mailing list