X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit.1;h=f099ed0f373327816bb64662ee023e5be05acb40;hb=f6f6419eca67882b47632875d2ee7163f4d005c7;hp=6e0c4f1186c2113795bc24cb14db02f396beef78;hpb=467846c8b31edae2e091e6ecf232fecefa32e247;p=dgit.git diff --git a/dgit.1 b/dgit.1 index 6e0c4f11..f099ed0f 100644 --- a/dgit.1 +++ b/dgit.1 @@ -835,7 +835,7 @@ with as ancestor a patches-applied branch. .BR --quilt=auto When fixing up source format `3.0 (quilt)' metadata, prefer to generate a linear patch stack -(as with --quilt=auto) +(as with --quilt=linear) but if that doesn't seem possible, try to generate a single squashed patch for all the changes made in git (as with --quilt=smash). @@ -1471,7 +1471,7 @@ or when pushing and .TP .BI dgit-distro. distro .git-create " " ssh-cmd | true .TP -.BR dgit-distro. \fIdistro\fR .archive-query " " ftpmasterapi: " | " madison: "\fIdistro\fR | " dummycat: "\fI/path\fR | " sshpsql: \fIuser\fR @ \fIhost\fR : \fIdbname\fR +.BR dgit-distro. \fIdistro\fR .archive-query " " ftpmasterapi: " | " madison: "\fIdistro\fR | " dummycat: "\fI/path\fR | " sshpsql: \fIuser\fR @ \fIhost\fR : \fIdbname\fR " " | " aptget:" .TP .BR dgit-distro. \fIdistro\fR .archive-query- ( url | tls-key | curl-ca-args ) .TP