diff options
author | Jean Delvare <jdelvare@suse.de> | 2014-01-20 11:06:10 +0100 |
---|---|---|
committer | Jean Delvare <jdelvare@suse.de> | 2014-01-20 11:06:10 +0100 |
commit | 2709005d413030f5a0b888ba20b40ae134959e87 (patch) | |
tree | 979233e8c1cfd34104e43809c52db468dc9f11bc /doc/main.tex | |
parent | ef7092293eb3398c561536e02722de70061387f8 (diff) | |
download | quilt-2709005d413030f5a0b888ba20b40ae134959e87.tar.gz |
Tree-wide white-space cleanups
* Delete blank lines at end of files.
* Delete white space at end of lines.
* Delete spaces before tab.
* Replace 8 spaces by a tab where it makes sense.
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 |