diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2004-07-02 01:14:07 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2004-07-02 01:14:07 +0000 |
| commit | 00227c3952cd1618d0bd6a6a2231046b3153c14e (patch) | |
| tree | 3e59ec140eca2924e8b2574de83f100a2940109d /doc/sample.quiltrc | |
| parent | 162d238c1d40b6e6eace4396f9ac7cf91685fa30 (diff) | |
| download | quilt-00227c3952cd1618d0bd6a6a2231046b3153c14e.tar.gz | |
- 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.
Diffstat (limited to 'doc/sample.quiltrc')
| -rw-r--r-- | doc/sample.quiltrc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/doc/sample.quiltrc b/doc/sample.quiltrc index 0aa72a7..c447f27 100644 --- a/doc/sample.quiltrc +++ b/doc/sample.quiltrc @@ -1,15 +1,16 @@ # Additional options passed to GNU diff # -p : Show which C function each change is in. -QUILT_DIFF_OPTS="-p${QUILT_DIFF_OPTS:+ $QUILT_DIFF_OPTS}" +QUILT_DIFF_OPTS="--show-c-function" # Additional options passed to GNU patch -#QUILT_PATCH_OPTS="" +#QUILT_PATCH_OPTS="--ignore-whitespace" # The directory in which patches are found (defaults to "patches"). #QUILT_PATCHES=patches -# Define this to generate diffs without timestamps. -#QUILT_NO_DIFF_TIMESTAMPS=yes +# Generate syntax-colored diffs without timestamps. +QUILT_DIFF_ARGS="--color=auto --no-timestamps" -# Create backup when refreshing patches. -QUILT_BACKUP=yes +# Generate patches without timestamps, and keep a backup of the previous +# patch. +QUILT_REFRESH_ARGS="--no-timestamps --backup" |