From 14fac808bd6c12bce121011bbf50501960c7326f Mon Sep 17 00:00:00 2001 From: Andrew Chow Date: Tue, 21 Feb 2023 17:00:13 -0500 Subject: [PATCH] verify-commits: Mention git v2.38.0 requirement --- contrib/verify-commits/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/verify-commits/README.md b/contrib/verify-commits/README.md index b8b15280bae..020890c3660 100644 --- a/contrib/verify-commits/README.md +++ b/contrib/verify-commits/README.md @@ -27,6 +27,10 @@ Note that the above isn't a good UI/UX yet, and needs significant improvements to make it more convenient and reduce the chance of errors; pull-reqs improving this process would be much appreciated. +Unless `--clean-merge 0` is specified, `verify-commits.py` will attempt to verify that +each merge commit applies cleanly (with some exceptions). This requires using at least +git v2.38.0. + Configuration files -------------------