summaryrefslogtreecommitdiff
path: root/dgit.7
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2022-09-03 14:03:53 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2022-09-03 20:14:26 +0100
commit05c51f36fed13475444083e587554557a3c8de12 (patch)
tree74179eb085002431d5d45988f2419a24e48d8475 /dgit.7
parentceb25938005b5bdf130425110e075a5cd7411410 (diff)
docs: No longer recommend single-debian-patch anywhere
See #1018984. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit.7')
-rw-r--r--dgit.710
1 files changed, 5 insertions, 5 deletions
diff --git a/dgit.7 b/dgit.7
index d1e5c7e..4144ed6 100644
--- a/dgit.7
+++ b/dgit.7
@@ -373,13 +373,13 @@ Your appropriate response depends on the cause and the context.
If you have been freely merging your git branch
and do not need need a pretty linear patch queue,
you can use
-.B --quilt=smash
-(or use the
-.B 1.0
+.BR --quilt=single
or
+.BR --quilt=smash .
+(Don't use
+the
.B single-debian-patch
-source formats; see
-.BR dpkg-source(1) .)
+dpkg source format option; it has strange properties.)
If you want a pretty linear series,
and this message is unexpected,
it can mean that you have unwittingly committed changes