summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-07-20 13:22:09 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2015-07-20 13:22:09 +0100
commitf1e8060c6ecfdee2ba6f82b7860e870678e321df (patch)
treee0cffd7cd2ad8eacdedc99abab136581ca4fb3bd
parent5c55b50b5b2962bd03ec543076189658d7a96935 (diff)
Document that --quilt=linear is the default for Debian.
-rw-r--r--debian/changelog1
-rw-r--r--dgit.12
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 30e8e5e..05d1752 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 4dfc6d2..df650d9 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