diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2003-02-15 21:29:15 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2003-02-15 21:29:15 +0000 |
| commit | f8c9405ef6c3f3227fafd5d80717aa78cc7cf94c (patch) | |
| tree | 501935ae36778f2e03528596139db5fc803a3b62 | |
| parent | 7717c8267ce89c17cd9c3963cdef1b0569a46472 (diff) | |
| download | quilt-f8c9405ef6c3f3227fafd5d80717aa78cc7cf94c.tar.gz | |
Correct description
| -rw-r--r-- | quilt/refresh.in | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/quilt/refresh.in b/quilt/refresh.in index a0119e0..315238b 100644 --- a/quilt/refresh.in +++ b/quilt/refresh.in @@ -30,19 +30,17 @@ usage() then echo $" -Refresh an applied patch. Refreshes the specified patch, or -the topmost patch by default. Documentation on top of the -actual patch is retained. - -It is possible to refresh patches that are not on top. If -any patches on top of the patch to refresh modify the same -files, this script prints out the file and patch names. If -there are any such conflicts, patches can still be refreshed -with -f. In that case this script will print a warning for -each shadowed file, changes by more recent patches will be -ignored, and only changes in files that have not been -modified by any more recent patches will end up in the -specified patch. +Refreshes the specified patch, or the topmost patch by default. +Documentation that comes before the actual patch in the patch file +is retained. + +It is possible to refresh patches that are not on top. If any +patches on top of the patch to refresh modify the same files, the +script aborts by default. Patches can still be refreshed with -f. +In that case this script will print a warning for each shadowed +file, changes by more recent patches will be ignored, and only +changes in files that have not been modified by any more recent +patches will end up in the specified patch. -p n Create a -p n style patch (-p0 or -p1 supported). |