summaryrefslogtreecommitdiffstats
path: root/doc/dev_patching.rst
Commit message (Collapse)AuthorAgeFilesLines
* doc: dev_patching: remove outdated note about 'extract --git'Roland Hieber2023-03-101-3/+0
| | | | | | | | | | Such problems should no longer occur since commit 48f2895f519004d9fa4a (2023-03-03, Michael Olbrich: "ptxd_make_world_init: make sure git from 'ptxdist --git extract ...' is ignored"). Signed-off-by: Roland Hieber <rhi@pengutronix.de> Message-Id: <20230309131342.3717841-1-rhi@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* doc: dev manual: how to recover from patch merge conflicts with gitRoland Hieber2021-06-251-0/+72
| | | | | | Signed-off-by: Roland Hieber <rhi@pengutronix.de> Message-Id: <20210616155631.12180-2-rhi@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
* doc: dev manual: propagate two subsections to sectionsRoland Hieber2021-06-251-0/+226
The "Adding new packages" section has become quite long already, to the point that some headings have reached level five and no longer make it into the table of contents. The subsections "Advanced rule files" and "Patching packages" are also not only relevant for new packages, so propagate them to their own sections. Signed-off-by: Roland Hieber <rhi@pengutronix.de> Message-Id: <20210616155631.12180-1-rhi@pengutronix.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>