|
@@ -39,8 +39,6 @@ rerun
|
|
|
|
|
|
make update
|
|
|
|
|
|
-The repository paths may be changed locally by creating a file `modules.local`.
|
|
|
-
|
|
|
`make update` also applies the patches that can be found in the directories found in
|
|
|
`patches`; the resulting branch will be called `patched`, while the commit specified in `modules`
|
|
|
can be refered to by the branch `base`.
|
|
@@ -64,4 +62,4 @@ If applying a patch fails because you have changed the base commit, the reposito
|
|
|
and you can try rebasing it onto the new `base` branch yourself and after that call `make update-patches` to fix the problem.
|
|
|
|
|
|
Always call `make update-patches` after making changes to a module repository as `make update` will overwrite your
|
|
|
-commits, making `git reflog` the only way to recover them!
|
|
|
+commits, making `git reflog` the only way to recover them!
|