summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2004-07-09 07:26:21 +0000
committerAndreas Gruenbacher <agruen@suse.de>2004-07-09 07:26:21 +0000
commite7bb642fdbcfa9bb1d7265781f56d89e398f90b9 (patch)
tree1ad9d16ce37e504ba72f9315c94ca9eb95597133 /doc
parentc871d820f8f00819613068aa77cb00d89e4508af (diff)
downloadquilt-e7bb642fdbcfa9bb1d7265781f56d89e398f90b9.tar.gz
- Switch from echo to printf for all translations: This is more
stable than having expansions in messages that might change independent of the message. - Add print_patch function and always use it when printing patch names. Remove -n options from various scripts and use a global switch QUILT_PATCHES_PREFIX in .quiltrc to decide between patch names with and without directory prefix. Depending on user experience this switch may eventually go away. - Add --diffstat option to refresh command: If given, this option inserts diffstat statistics at the end of the patch header, or refreshes the existing diffstat output. No special tags in the path file (%diffstat or the like) are needed. - Minor fix inserting changelog into RPM specfile.
Diffstat (limited to 'doc')
-rw-r--r--doc/quilt.1.in22
-rw-r--r--doc/sample.quiltrc3
2 files changed, 16 insertions, 9 deletions
diff --git a/doc/quilt.1.in b/doc/quilt.1.in
index f8238ad..8d3289b 100644
--- a/doc/quilt.1.in
+++ b/doc/quilt.1.in
@@ -100,17 +100,21 @@ no longer needed, so there is no need to clean up manually.
.SH EXAMPLE OF WORKING TREE
+.fam C
+.RS
.nf
- +- work/ -+- ...
- | |- patches/ -+- series
- | | |- patch2.diff
- | | |- patch1.diff
- | | +- ...
- | +- .pc/ -+- applied-patches
- | |- patch1.diff/ -+- ...
- | |- patch2.diff/ -+- ...
- | +- ...
+work/ -+- ...
+ |- patches/ -+- series
+ | |- patch2.diff
+ | |- patch1.diff
+ | +- ...
+ +- .pc/ -+- applied-patches
+ |- patch1.diff/ -+- ...
+ |- patch2.diff/ -+- ...
+ +- ...
.fi
+.RE
+.fam T
.SH EXAMPLE
diff --git a/doc/sample.quiltrc b/doc/sample.quiltrc
index c447f27..5306322 100644
--- a/doc/sample.quiltrc
+++ b/doc/sample.quiltrc
@@ -8,6 +8,9 @@ QUILT_DIFF_OPTS="--show-c-function"
# The directory in which patches are found (defaults to "patches").
#QUILT_PATCHES=patches
+# Include the QUILT_PATCHES directory when printing patch names?
+QUILT_PATCHES_PREFIX=yes
+
# Generate syntax-colored diffs without timestamps.
QUILT_DIFF_ARGS="--color=auto --no-timestamps"