diff options
| -rw-r--r-- | quilt.changes | 8 | ||||
| -rw-r--r-- | quilt.quiltrc | 6 |
2 files changed, 13 insertions, 1 deletions
diff --git a/quilt.changes b/quilt.changes index 4161baa..8f9ad4b 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Mar 26 00:11:27 CET 2008 - agruen@suse.de + +- Assume patches are in unified format by default when applying + them. (For working with other patch formats, make sure to remove + "--unified" from QUILT_PATCH_OPTS in ~/.quiltrc or + /etc/quilt.quiltrc.) + +------------------------------------------------------------------- Mon Nov 5 17:25:49 CET 2007 - agruen@suse.de - quilt/mail.in: Remove the Recipient-* and Replace-* headers diff --git a/quilt.quiltrc b/quilt.quiltrc index e89039a..bed300c 100644 --- a/quilt.quiltrc +++ b/quilt.quiltrc @@ -2,8 +2,12 @@ # Options passed to GNU diff when generating patches QUILT_DIFF_OPTS="--show-c-function" -# Options passed to GNU patch when applying patches + +# Options passed to GNU patch when applying patches. +# (For appling patches which are not in unified format, remove the "--unified".) #QUILT_PATCH_OPTS="--ignore-whitespace" +QUILT_PATCH_OPTS="--unified" + # Options passed to diffstat when generating patch statistics #QUILT_DIFFSTAT_OPTS="-f0" |