|
|
@@ -43,11 +43,11 @@ rerun
|
|
|
`patches`; the resulting branch will be called `patched`, while the commit specified in `modules`
|
|
|
can be refered to by the branch `base`.
|
|
|
|
|
|
- make unpatch
|
|
|
+ make unpatch
|
|
|
|
|
|
sets the repositories to the `base` branch,
|
|
|
|
|
|
- make patch
|
|
|
+ make patch
|
|
|
|
|
|
re-applies the patches by resetting the `patched` branch to `base` and calling `git am`
|
|
|
for the patch files. Calling `make` or a similar command after calling `make unpatch`
|
|
|
@@ -56,6 +56,7 @@ is generally not a good idea.
|
|
|
After new patches have been commited on top of the patched branch (or existing commits
|
|
|
since the base commit have been edited or removed), the patch directories can be regenerated
|
|
|
using
|
|
|
+
|
|
|
make update-patches
|
|
|
|
|
|
If applying a patch fails because you have changed the base commit, the repository will be reset to the old `patched` branch
|
Matthias Schiffer