diff options
author | Andreas Gruenbacher <agruen@suse.de> | 2003-02-16 20:32:43 +0000 |
---|---|---|
committer | Andreas Gruenbacher <agruen@suse.de> | 2003-02-16 20:32:43 +0000 |
commit | 3eecd9793f12f5ac7b87bceba06c343dfbc7cd3a (patch) | |
tree | 05f90e1d6ff4574abf01e81a0f14e2ae60732783 /quilt | |
parent | 867131b0791c4276cfdd273c20c3136ab63557f3 (diff) | |
download | quilt-3eecd9793f12f5ac7b87bceba06c343dfbc7cd3a.tar.gz |
Format in-line documentation to be around 72 characters in width.
Diffstat (limited to 'quilt')
-rw-r--r-- | quilt/add.in | 7 | ||||
-rw-r--r-- | quilt/delete.in | 4 | ||||
-rw-r--r-- | quilt/diff.in | 18 | ||||
-rw-r--r-- | quilt/files.in | 3 | ||||
-rw-r--r-- | quilt/import.in | 7 | ||||
-rw-r--r-- | quilt/new.in | 4 | ||||
-rw-r--r-- | quilt/pop.in | 17 | ||||
-rw-r--r-- | quilt/push.in | 13 | ||||
-rw-r--r-- | quilt/refresh.in | 20 | ||||
-rw-r--r-- | quilt/remove.in | 5 | ||||
-rw-r--r-- | quilt/setup.in | 6 |
11 files changed, 49 insertions, 55 deletions
diff --git a/quilt/add.in b/quilt/add.in index b20af1c..a696bc4 100644 --- a/quilt/add.in +++ b/quilt/add.in @@ -24,10 +24,9 @@ usage() then echo $" -Add one or more files to the topmost or named patch. -Files must be added to the patch before being modified. -Files that are modified by patches on top of the specified -patch cannot be added. +Add one or more files to the topmost or named patch. Files must be +added to the patch before being modified. Files that are modified by +patches on top of the specified patch cannot be added. -p patch Patch to add files to." diff --git a/quilt/delete.in b/quilt/delete.in index 3cedffb..cd4bdf8 100644 --- a/quilt/delete.in +++ b/quilt/delete.in @@ -24,8 +24,8 @@ usage() then echo $" -Remove the specified or topmost patch from the series file. If the -patch is applied, quilt will attempt to remove it first. (Only the +Remove the specified or topmost patch from the series file. If the +patch is applied, quilt will attempt to remove it first. (Only the topmost patch can be removed right now.)" exit 0 diff --git a/quilt/diff.in b/quilt/diff.in index 3a52dea..3db213b 100644 --- a/quilt/diff.in +++ b/quilt/diff.in @@ -30,24 +30,24 @@ usage() then echo $" -Produces a diff of the specified file(s) in the topmost or -specified patch. If no files are specified, all files that -are modified are included. +Produces a diff of the specified file(s) in the topmost or specified +patch. If no files are specified, all files that are modified are +included. -p n Create a -p n style patch (-p0 or -p1 are supported). -P patch - Create a diff for the specified patch. (Defaults to - the topmost patch.) + Create a diff for the specified patch. (Defaults to the topmost + patch.) -c patch - Create a combined diff for all patches between this - patch and the patch specified with -P. + Create a combined diff for all patches between this patch and + the patch specified with -P. -R Create a reverse diff. --z Write to standard output the changes that have been - made relative to the topmost or specified patch. +-z Write to standard output the changes that have been made + relative to the topmost or specified patch. " exit 0 diff --git a/quilt/files.in b/quilt/files.in index 6d57efa..796b9e2 100644 --- a/quilt/files.in +++ b/quilt/files.in @@ -24,8 +24,7 @@ usage() then echo $" -Print the list of files that the topmost or specified patch -changes. +Print the list of files that the topmost or specified patch changes. -v Verbose, more user friendly output. diff --git a/quilt/import.in b/quilt/import.in index 7724f4f..ff4c306 100644 --- a/quilt/import.in +++ b/quilt/import.in @@ -24,10 +24,9 @@ usage() then echo $" -Import an external patch. If a patch file name is specified, -the patch will be stored in this relative path in the patches/ -directory. Else, if an input file name is given this name is -used as the patch name. +Import an external patch. If a patch file name is specified, the patch +will be stored in this relative path in the patches/ directory. Else, +if an input file name is given this name is used as the patch name. -p num Number of directory levels to strip when aplying (default=1) diff --git a/quilt/new.in b/quilt/new.in index 38ad964..320349d 100644 --- a/quilt/new.in +++ b/quilt/new.in @@ -24,8 +24,8 @@ usage() then echo $" -Create a new patch with the specified file name, and insert -it after the topmost patch in the patch series file. +Create a new patch with the specified file name, and insert it after the +topmost patch in the patch series file. " exit 0 diff --git a/quilt/pop.in b/quilt/pop.in index b46ba59..4b8f565 100644 --- a/quilt/pop.in +++ b/quilt/pop.in @@ -24,19 +24,18 @@ usage() then echo $" -Remove patch(es) from the current stack. A number of -patches to remove, or a patch name can be specified. If a -patch name is given, remove all patches applied on top of the -named patch. If neither a number nor a patch name is specified, -remove the next patch from the series file. +Remove patch(es) from the current stack. A number of patches to remove, +or a patch name can be specified. If a patch name is given, remove all +patches applied on top of the named patch. If neither a number nor a +patch name is specified, remove the next patch from the series file. -a Remove all applied patches. --f Force remove. The state before the patch(es) were - applied will be restored from backup files. +-f Force remove. The state before the patch(es) were applied will + be restored from backup files. --R Remove the patch with \`patch -R' and check if the - patch reverts all changes properly. +-R Remove the patch with \`patch -R' and check if the patch reverts + all changes properly. -q Quiet operation. diff --git a/quilt/push.in b/quilt/push.in index 5bc1230..ad3c706 100644 --- a/quilt/push.in +++ b/quilt/push.in @@ -24,11 +24,10 @@ usage() then echo $" -Apply patch(es) from the series file. A number of patches -to apply, or a patch name can be specified. If a patch -name is given, apply all patches up to and including the -named patch. If neither a number nor a patch name is -specified, apply the next patch from the series file. +Apply patch(es) from the series file. A number of patches to apply, or +a patch name can be specified. If a patch name is given, apply all +patches up to and including the named patch. If neither a number nor a +patch name is specified, apply the next patch from the series file. -a Apply all patches in the series file. @@ -39,8 +38,8 @@ specified, apply the next patch from the series file. -v Verbose operation. --leave-rejects - Leave around the reject files patch produced, even if - the patch is not actually applied. + Leave around the reject files patch produced, even if the patch + is not actually applied. " exit 0 diff --git a/quilt/refresh.in b/quilt/refresh.in index 89b15e0..dc6b440 100644 --- a/quilt/refresh.in +++ b/quilt/refresh.in @@ -31,16 +31,16 @@ usage() echo $" 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. +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). diff --git a/quilt/remove.in b/quilt/remove.in index 4c0dbaa..d48300b 100644 --- a/quilt/remove.in +++ b/quilt/remove.in @@ -24,9 +24,8 @@ usage() then echo $" -Remove one or more files from the topmost or named patch. -Files that are modified by patches on top of the specified -patch cannot be removed. +Remove one or more files from the topmost or named patch. Files that +are modified by patches on top of the specified patch cannot be removed. -p patch Patch to remove files from. diff --git a/quilt/setup.in b/quilt/setup.in index 773ab9d..08b4115 100644 --- a/quilt/setup.in +++ b/quilt/setup.in @@ -24,9 +24,9 @@ usage() then echo $" -Initializes a source tree from a patch series file. The -patch series file must contain the name of the relevant -tar archive, in addition to the list of patches. +Initializes a source tree from a patch series file. The patch series +file must contain the name of the relevant tar archive, in addition to +the list of patches. " exit 0 |