dgit(1): baredebian+tarball: Document new quilt mode

[dgit.git] / dgit.1

diff --git a/dgit.1 b/dgit.1
index 3aebe8e26a98f640ca39b65489b6e90df4d582ab..bff3c51892ec69cf11098dc8131b7ab0a39fceb9 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -695,7 +695,7 @@ of git merge -s ours) to stitch the archive's version into your own
 git history, so that your push is a fast forward from the archive.
 
 (In quilt mode
-.BR gbp ", " dpm ", " unpatched " or " baredebian ,
+.BR gbp ", " dpm ", " unpatched " or " baredebian *,
 implying a split between the dgit view and the
 maintainer view, the pseudo-merge will appear only in the dgit view.)
 .TP
@@ -853,7 +853,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
-.BR -- [ quilt= ] gbp " | " -- [ quilt= ] dpm " | " --quilt=unapplied " | " -- [ quilt= ] baredebian
+.BR -- [ quilt= ] gbp " | " -- [ quilt= ] dpm " | " --quilt=unapplied " | " -- [ quilt= ] baredebian [ +tarball ]
 Tell dgit that you are using a nearly-dgit-compatible git branch,
 aka a
 .BR "maintainer view" ,
@@ -897,7 +897,18 @@ all edited upstream files are properly represented as patches:
 dgit relies on
 debian/patches being correct.
 
-With --quilt=gbp|dpm|unapplied|baredebian,
+.B --quilt=baredebian+tarball
+is like --quilt=baredebian,
+but is used when there is no appropriate upstream git history.
+To construct the dgit view,
+dgit will import your orig tarballs' contents into git.
+In this mode, dgit cannot check that
+the upstream parts of your upload correspond to what you intend:
+dgit relies on
+the right orig tarball(s) existing, and
+debian/patches being correct.
+
+With --quilt=gbp|dpm|unapplied|baredebian*,
 dgit push (or precursors like quilt-fixup and build) will automatically
 generate a conversion of your git branch into the right form.
 dgit push will push the
@@ -961,7 +972,7 @@ to make a correct `3.0 (quilt)' source package.
 is the default, and splits the view only when needed:
 i.e., when you are working with a `3.0 (quilt)' source package
 and a splitting quilt mode:
-\-\-[quilt=]gbp, dpm, unpatched or baredebian.
+\-\-[quilt=]gbp, dpm, unpatched or baredebian*.
 
 .B always
 splits the view regardless of the source format and the quilt mode.