diff options
Diffstat (limited to 'dgit.7')
-rw-r--r-- | dgit.7 | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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 |