From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 20 Jul 2015 12:22:09 +0000 (+0100)
Subject: Document that --quilt=linear is the default for Debian.
X-Git-Tag: debian/1.1~71
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=f1e8060c6ecfdee2ba6f82b7860e870678e321df

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

diff --git a/debian/changelog b/debian/changelog
index 30e8e5e7..05d1752c 100644
--- 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 --quilt=linear is the default for Debian.
 
  --
 
diff --git a/dgit.1 b/dgit.1
index 4dfc6d2f..df650d9a 100644
--- 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,
-fail.
+fail.  This is the default for Debian.
 .TP
 .BR --quilt=auto
 When fixing up source format `3.0 (quilt)' metadata, prefer to