changelog: Minor adjustment to git-debpush discussion

[dgit.git] / dgit.1

diff --git a/dgit.1 b/dgit.1
index cb1cbe218965bfd2c69b983cd5216a5aec8a124f..8ede01f3e38a6be7c6baea8d67ffc42b5f9cc5c5 100644 (file)
--- 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
 .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).
 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).


@@ -865,7 +865,7 @@ Do not check whether source format `3.0 (quilt)' metadata needs
 fixing up.  If you use this option and the metadata did in fact need
 fixing up, dgit push will fail.
 .TP
 fixing up.  If you use this option and the metadata did in fact need
 fixing up, dgit push will fail.
 .TP

-.BR -- [ quilt= ] gbp " | " -- [ quilt= ] dpm " | " --quilt=unapplied " | " -- [ quilt= ] baredebian [ +tarball ]
+.BR -- [ quilt= ] gbp " | " -- [ quilt= ] dpm " | " --quilt=unapplied " | " -- [ quilt= ] baredebian [ +git | +tarball ]

 Tell dgit that you are using a nearly-dgit-compatible git branch,
 aka a
 .BR "maintainer view" ,
 Tell dgit that you are using a nearly-dgit-compatible git branch,
 aka a
 .BR "maintainer view" ,


@@ -898,6 +898,8 @@ that any changes to upstream .gitignore files are represented as
 patches in debian/patches).
 
 .B --quilt=baredebian
 patches in debian/patches).
 
 .B --quilt=baredebian

+(or its alias
+.BR --quilt=baredebian+git )

 specifies that your HEAD contains only a debian/ directory,
 with any changes to upstream files represented as
 patches in debian/patches.
 specifies that your HEAD contains only a debian/ directory,
 with any changes to upstream files represented as
 patches in debian/patches.