- Several Fixes from Joe Green <jgreen@mvista.com>:

  + Another sed \t\r problem, in Makefile.in
  + Bad error message on "quilt delete" of non-existent patch
  + "import" doesn't remove all leading components on patch file
  + Misspelling in "import" help text
- With using the GNU diff --label option, file timestamps
  disappeared. Specify the timestamps in --label by hand: This
  gives us added flexibility when generating patches; we may
  some day want to support diff styles other than unified.
  Also reported by Joe Green.
- Add --backup option to quilt refresh.
- Update documentation to QUILT_${COMMAND}_ARGS in .quiltrc.
  (The old settings still work but they are no longer documented.)
- Update German translation.

1 files changed, 8 insertions, 14 deletions

diff --git a/doc/main.tex b/doc/main.tex
index 2a02cce..de9805b 100644
--- a/doc/main.tex
+++ b/doc/main.tex
@@ -641,14 +641,16 @@ the series file in this case.
 
 \section{Customizing Quilt}
 
-The following settings influence how quilt behaves:
+Upon startup, quilt evaluates the file \textsf{.quiltrc} in the user's
+home directory, or the file specified with the \textsf{--quiltrc} option.
+This file is a regular bash script. Default options can be passed to
+any command by defining a \textsf{QUILT\_\textit{COMMAND}\_ARGS} variable
+(for example, \textsf{QUILT\_DIFF\_ARGS="--color=auto"} causes the output
+of \quilt{diff} to be syntax colored when writing to a terminal).
 
-\begin{description}
+In addition to that, quilt recognizes the following variables:
 
-\item[\textsf{QUILT\_BACKUP}]
-When set to ``\textsf{yes}'', the \quilt{refresh} command will create
-backup files when refreshing patches. The backup files have
-``\textsc{\~}'' appended to the patch file names.
+\begin{description}
 
 \item[\textsf{QUILT\_DIFF\_OPTS}]
 Additional options that quilt shall pass to \prog{GNU diff} when
@@ -656,10 +658,6 @@ generating patches. A useful setting for C source code is
 ``\textsf{-p}'', which causes \prog{GNU diff} to show in the resulting
 patch which function a change is in.
 
-\item[\textsf{QUILT\_NO\_DIFF\_TIMESTAMPS}]
-When set to ``\textsf{yes}'', the \quilt{diff} and \quilt{refresh}
-commands will not include file timestamps in patches.
-
 \item[\textsf{QUILT\_PATCH\_OPTS}]
 Additional options that quilt shall pass to \prog{GNU patch} when
 applying patches. (For example, some versions of \prog{GNU patch}
@@ -672,10 +670,6 @@ defaults to ``\textsf{patches}''.
 
 \end{description}
 
-These settings can either be defined in the environment, or in the file
-\textsf{.quiltrc} in user home directories. \textsf{.quiltrc} is a
-\prog{bash} script.
-
 \section{Pitfalls and Known Problems}
 
 As mentioned earlier, files must be added to patches before they can be