Skip to content

Commit b813fbe

Browse files
author
MarcoFalke
committed
Merge #17159: doc: Add a note about backporting
2a6bce4 doc: Add a note about backporting (Carnhof Daki) Pull request description: See laanwj's comment in #17158 bitcoin/bitcoin#17158 (comment) Top commit has no ACKs. Tree-SHA512: ac5248a796050ce1a5bd0718955f941f6a3c025e192599948f12566eb55296079404b999676b9a2c8fe10616fc8334698dfa415af0fb4db6c98038d52218af1f
2 parents 9c507a7 + 2a6bce4 commit b813fbe

File tree

1 file changed

+25
-0
lines changed

1 file changed

+25
-0
lines changed

CONTRIBUTING.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,31 @@ about:
309309
when someone else is asking for feedback on their code, and universe balances out.
310310

311311

312+
Backporting
313+
-----------
314+
315+
Security and bug fixes can be backported from `master` to release
316+
branches.
317+
If the backport is non-trivial, it may be appropriate to open an
318+
additional PR, to backport the change, only after the original PR
319+
has been merged.
320+
Otherwise, backports will be done in batches and
321+
the maintainers will use the proper `Needs backport (...)` labels
322+
when needed (the original author does not need to worry).
323+
324+
A backport should contain the following metadata in the commit body:
325+
326+
```
327+
Github-Pull: #<PR number>
328+
Rebased-From: <commit hash of the original commit>
329+
```
330+
331+
Have a look at [an example backport PR](
332+
https://github.com/bitcoin/bitcoin/pull/16189).
333+
334+
Also see the [backport.py script](
335+
https://github.com/bitcoin-core/bitcoin-maintainer-tools#backport).
336+
312337
Release Policy
313338
--------------
314339

0 commit comments

Comments
 (0)