Document that --quilt=linear is the default for Debian.

diff --git a/debian/changelog b/debian/changelog
index 30e8e5e7116800deb12f906c5ec30c51a3c46503..05d1752cdec68cd1aa9a616daa2a546db00e044c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ dgit (1.1) unstable; urgency=low
   * Document that up to -DDD (not just -DD) is meaningfully different.
   * Document that -cname=value applies only for this run.
   * Improve manpage comment about defining a new distro.
   * Document that up to -DDD (not just -DD) is meaningfully different.
   * Document that -cname=value applies only for this run.
   * Improve manpage comment about defining a new distro.

+  * Document that --quilt=linear is the default for Debian.

 
  --
 
 
  --
 

diff --git a/dgit.1 b/dgit.1
index 4dfc6d2f8df9863d130a9814881d2aa17cf9beb1..df650d9a1ffc64d538b2b90867d28f58c1250734 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -342,7 +342,7 @@ as the Debian server will do this automatically when necessary.
 .BR --quilt=linear
 When fixing up source format `3.0 (quilt)' metadata, insist on
 generating a linear patch stack.  If such a stack cannot be generated,
 .BR --quilt=linear
 When fixing up source format `3.0 (quilt)' metadata, insist on
 generating a linear patch stack.  If such a stack cannot be generated,

-fail.
+fail.  This is the default for Debian.

 .TP
 .BR --quilt=auto
 When fixing up source format `3.0 (quilt)' metadata, prefer to
 .TP
 .BR --quilt=auto
 When fixing up source format `3.0 (quilt)' metadata, prefer to