diff options
Diffstat (limited to 'doc/main.tex')
| -rw-r--r-- | doc/main.tex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/main.tex b/doc/main.tex index a3404c4..ee8e0c7 100644 --- a/doc/main.tex +++ b/doc/main.tex @@ -506,7 +506,7 @@ accordingly. Quilt can apply patches with an arbitrary strip level, and produces patches with a strip level of zero or one. With a strip level of one, the name of the directory that contains the working tree is used as the additional path component. (So in our example, -\textsf{Oberon.txt} is contained in directory \textsf{example1}.) +\textsf{Oberon.txt} is contained in directory \textsf{example1}.) \subsection{Importing Patches} @@ -539,7 +539,7 @@ generating a single patch out of all the patches in the series file. \subsection{Merging with upstream} The concept of merging your patches with upstream is identical to applying -your patches on a more recent version of the software. +your patches on a more recent version of the software. Before merging, make sure to pop all your patches using \quilt{pop -a}. Then, update your codebase. Finally, remove obsoleted patches |