Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
Next revisionBoth sides next revision
submitting-patches [2024/01/03 07:36] – Added patch backports section ynezzsubmitting-patches [2024/06/17 08:59] – old revision restored (2024/01/03 07:44) svanheule
Line 74: Line 74:
   - Changes needs to be first applied into the **main** branch   - Changes needs to be first applied into the **main** branch
   - Afterwards those changes can be proposed to be applied into the stable (release) branch   - Afterwards those changes can be proposed to be applied into the stable (release) branch
-When pulling the commits from the **main** branch, you need to use ''git cherry-pick'' command with the ''-x'' argument and thus append a line that says "(cherry picked from commit <commit>)to the original commit message in order to indicate which commit this change was cherry-picked from. This is needed for traceability. It is also required that you add the ''--signoff'' to the commits, if you did not create the original commits.+When pulling the commits from the **main** branch, you need to use ''git cherry-pick'' command with the ''-x'' argument and thus append a line that says ''(cherry picked from commit <commit>)'' to the original commit message ([[https://github.com/openwrt/openwrt/commit/59fd8f08cf544a7f0fcaf700ca9af9292de3adcc.patch|example]]) in order to indicate which commit this change was cherry-picked from. This is needed for traceability. It is also required that you add the ''--signoff'' to the commits, if you did not create the original commits.
 <code bash> <code bash>
 $ git cherry-pick --signoff -x <commit> $ git cherry-pick --signoff -x <commit>
  • Last modified: 2024/12/06 16:55
  • by wertwert4pda