From 85c2bb37816dd79724a27ce7b97647a2ebf21ec0 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Fri, 15 Nov 2019 15:05:42 +0100 Subject: [PATCH] =?UTF-8?q?doc/contributing:=20mention=20the=20word=20?= =?UTF-8?q?=E2=80=9Cbackporting=E2=80=9D=20for=20grep-ability?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When a contributor wants to know how to do this ominous “backporting” everybody is talking about, a grep should be enough to find it. --- doc/contributing/submitting-changes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/contributing/submitting-changes.xml b/doc/contributing/submitting-changes.xml index 6a8b4e0b249..950e1ea974a 100644 --- a/doc/contributing/submitting-changes.xml +++ b/doc/contributing/submitting-changes.xml @@ -441,7 +441,7 @@ Additional information. - If you're cherry-picking a commit to a stable release branch, always use git cherry-pick -xe and ensure the message contains a clear description about why this needs to be included in the stable branch. + If you're cherry-picking a commit to a stable release branch (“backporting”), always use git cherry-pick -xe and ensure the message contains a clear description about why this needs to be included in the stable branch. An example of a cherry-picked commit would look like this: