summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/quilt.1.in10
-rw-r--r--quilt.changes5
2 files changed, 12 insertions, 3 deletions
diff --git a/doc/quilt.1.in b/doc/quilt.1.in
index db91b14..eb2e8d1 100644
--- a/doc/quilt.1.in
+++ b/doc/quilt.1.in
@@ -17,7 +17,7 @@ etc. The key philosophical concept is that your primary output is patches.
With quilt, all work occurs within a single directory tree. Commands can be
be invoked from anywhere within the source tree. They are of the form
.B quilt cmd
-similar to CVS commands. They can be abbreviated as long as the specified
+similar to CVS, svn or git commands. They can be abbreviated as long as the specified
part of the command is unique. All commands print some help text with
.B quilt cmd -h.
@@ -39,10 +39,14 @@ Patch files are located in the
.I patches
sub-directory of the source tree (see EXAMPLE OF WORKING TREE below). The
.I QUILT_PATCHES
-environment variable can be used to override this location. The
+environment variable can be used to override this location. When not
+found in the current directory, that subdirectory is searched
+recursively in the parent directories (this is similar to the way
+.I git
+searches for its configuration files). The
.I patches
directory may contain sub-directories. It may also be a symbolic link
-instead of a directory.
+instead of a directory.
A file called
.I series
diff --git a/quilt.changes b/quilt.changes
index 71965f3..1ca87b1 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,3 +1,8 @@
+Thu Dec 27 14:26:31 CET 2012 - mquinson@debian.org
+
+- Document how quilt searches for its 'patches' directory in man page
+ (Closes http://bugs.debian.org/549482).
+
-------------------------------------------------------------------
Tue Dec 18 18:20:49 CET 2012 - jdelvare@suse.de