nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

README: fix code blocks

Browse Source
This commit is contained in:
Matthias Schiffer 2014-01-11 12:14:27 +01:00
parent 29e9203c4f
commit 914d8f9349
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -43,11 +43,11 @@ rerun
`patches`; the resulting branch will be called `patched`, while the commit specified in `modules` `patches`; the resulting branch will be called `patched`, while the commit specified in `modules`
can be refered to by the branch `base`. can be refered to by the branch `base`.
make unpatch make unpatch
sets the repositories to the `base` branch, 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` 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` 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 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 since the base commit have been edited or removed), the patch directories can be regenerated
using using
make update-patches 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 If applying a patch fails because you have changed the base commit, the repository will be reset to the old `patched` branch