X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit.1;h=8ede01f3e38a6be7c6baea8d67ffc42b5f9cc5c5;hb=ac981dd92158727ad37f82d4b609c498539b848a;hp=6e0c4f1186c2113795bc24cb14db02f396beef78;hpb=467846c8b31edae2e091e6ecf232fecefa32e247;p=dgit.git diff --git a/dgit.1 b/dgit.1 index 6e0c4f11..8ede01f3 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).