diff options
| author | Martin Quinson <martin.quinson@loria.fr> | 2011-09-28 16:12:23 +0200 |
|---|---|---|
| committer | Martin Quinson <martin.quinson@loria.fr> | 2011-09-28 16:12:23 +0200 |
| commit | 90e69fc77ceae0b6f75408501de354a161fe9ed0 (patch) | |
| tree | cff7115ebe6619fc8c5caf9881c1eb88d01ad0d9 /doc/quilt.1.in | |
| parent | 96440f3c1d2afafc0a1310d9176f58c58a46c76e (diff) | |
| download | quilt-90e69fc77ceae0b6f75408501de354a161fe9ed0.tar.gz | |
several documentation fixes that were accumulated over the years in Debian package
Diffstat (limited to 'doc/quilt.1.in')
| -rw-r--r-- | doc/quilt.1.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/quilt.1.in b/doc/quilt.1.in index f4b94e6..1c1dcc2 100644 --- a/doc/quilt.1.in +++ b/doc/quilt.1.in @@ -145,8 +145,8 @@ Please refer to the pdf documentation for an example. Upon startup, quilt evaluates the file .quiltrc in the user's home directory, or the file specified with the --quiltrc option. This file -is a regular bash script. Default options can be passed to any command -by defining a QUILT_COMMAND_ARGS variable. For example, +is a regular bash script. Default options can be passed to any COMMAND +by defining a QUILT_${COMMAND}_ARGS variable. For example, QUILT_DIFF_ARGS="--color=auto" causes the output of quilt diff to be syntax colored when writing to a terminal. @@ -161,9 +161,9 @@ to show in the resulting patch which function a change is in. .IP QUILT_PATCH_OPTS 4 Additional options that quilt shall pass to GNU patch when applying -patches. For example, some versions of GNU patch support the -"--unified-reject-files" option for generating reject files in unified -diff style. +patches. For example, recent versions of GNU patch support the +"--reject-format=unified" option for generating reject files in unified +diff style (older patch versions used "--unified-reject-files" for that). .IP QUILT_DIFFSTAT_OPTS 4 |