1 files changed, 9 insertions, 7 deletions
@@ -470,9 +470,9 @@ that any changes to upstream .gitignore files are represented as
patches in debian/patches).
-dgit quilt-fixup and dgit-push will automatically
-convert your git branch into the right form,
-and dgit push will push the
+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
dgit-compatible form (the
.BR "dgit view" )
to the dgit git server.
@@ -484,13 +484,15 @@ dgit push will create a tag
for the maintainer view, and the dgit tag
.BI archive/debian/ version
for the dgit view.
+dgit quilt-fixup will merely do some checks,
+and cache the maintainer view.
.B If you have a branch like this it is essential to specify the appropriate --quilt= option!
This is because it is not always possible to tell: a patches-unapplied
-git branch of a package with one patch, for example, looks just the
-same as a patches-applied branch where the user has used git revert to
+git branch of a package with one patch, for example, looks very like
+a patches-applied branch where the user has used git revert to
undo the patch, expecting to actually revert it.
-If you fail to specify the right \-\-quilt option,
+However, if you fail to specify the right \-\-quilt option,
and you aren't too lucky, dgit will notice the problem and stop,
with a useful hint.
@@ -558,7 +560,7 @@ Specifying --git is not effective for some lower-level read-only git
operations performed by dgit, and also not when git is invoked by
another program run by dgit.
-See notes above regarding ssh and dgit.
+See notes below regarding ssh and dgit.
NB that --gpg:option is not supported (because debsign does not
have that facility).