Merge pull request #73459 from Profpatsch/nixpkgs-manual-mention-backport

doc/contributing: mention the word “backporting” for grep-ability
This commit is contained in:
Florian Klink 2019-11-15 15:11:53 +01:00 committed by GitHub
commit c0f0cb6d2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -441,7 +441,7 @@ Additional information.
<itemizedlist>
<listitem>
<para>
If you're cherry-picking a commit to a stable release branch, always use <command>git cherry-pick -xe</command> 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 <command>git cherry-pick -xe</command> and ensure the message contains a clear description about why this needs to be included in the stable branch.
</para>
<para>
An example of a cherry-picked commit would look like this: