X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit.1;h=6e0c4f1186c2113795bc24cb14db02f396beef78;hb=ca8674c84bed3c19ea59978dca4530d85332de18;hp=cf7b8c52c262e6957e2b58e8f59a9789aaee8dfd;hpb=6738d3cea80e524dd1ce22a849c44167297bc3a9;p=dgit.git diff --git a/dgit.1 b/dgit.1 index cf7b8c52..6e0c4f11 100644 --- a/dgit.1 +++ b/dgit.1 @@ -647,7 +647,7 @@ Note that this does .BR not prevent dgit from cleaning your tree, so if the changes in your working tree are in the form of untracked files, those might still be -deleted. +deleted, especially with --clean=git. If you want to include untracked files in the build, you can use --clean=none or --clean=dpkg-source[-d] in addition to --include-dirty. @@ -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 -.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" , @@ -898,6 +898,8 @@ that any changes to upstream .gitignore files are represented as 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.