diff options
Diffstat (limited to 'dgit.1')
| -rw-r--r-- | dgit.1 | 24 |
1 files changed, 20 insertions, 4 deletions
@@ -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 " or " unpatched , +.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 +.BR -- [ quilt= ] gbp " | " -- [ quilt= ] dpm " | " --quilt=unapplied " | " -- [ quilt= ] baredebian Tell dgit that you are using a nearly-dgit-compatible git branch, aka a .BR "maintainer view" , @@ -885,7 +885,15 @@ specifies that your HEAD is a patches-unapplied git branch (and that any changes to upstream .gitignore files are represented as patches in debian/patches). -With --quilt=gbp|dpm|unapplied, +.B --quilt=baredebian +specifies that your HEAD contains only a debian/ directory, +with any changes to upstream .gitignore files are represented as +patches in debian/patches. +The upstream source must be available in git, +by default, in a suitably named git tag; +see --upstream-commitish. + +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 @@ -949,7 +957,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 or unpatched. +\-\-[quilt=]gbp, dpm, unpatched or baredebian. .B always splits the view regardless of the source format and the quilt mode. @@ -982,6 +990,14 @@ otherwise, the changes file is expected in that directory (by default, in .BR .. ). .TP +.BI \-\-upstream-commitish= upstream +For use with --quilt=baredebian only. +Specifies the commit containing the upstream source. +This commit must be identical to your .orig tarball. +The default is to look for one of the git tags +.IB U " v" U " upstream/" U +(in that order), where U is the upstream version. +.TP .B \-\-rm-old-changes When doing a build, delete any changes files matching .IB package _ version _*.changes |