When we are using dpkg-buildpackage to clean before using it to also do the build...

[dgit.git] / dgit.1

diff --git a/dgit.1 b/dgit.1
index e8f7eb233dab4bc976b46f6c1d9019dea3f778d5..88e98128b43a404d121ec17b6570a36ba23271b1 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -134,10 +134,10 @@ in the parent directory will be removed; the output is left in
 
 Tagging, signing and actually uploading should be left to dgit push.
 .TP
 
 Tagging, signing and actually uploading should be left to dgit push.
 .TP

-\fBdgit git-build\fR ...
+\fBdgit gbp-build\fR ...

 Runs
 .B git-buildpackage
 Runs
 .B git-buildpackage

-with some suitable options.  Options and arguments after git-build
+with some suitable options.  Options and arguments after gbp-build

 will be passed on to git-buildpackage.
 
 Tagging, signing and actually uploading should be left to dgit push.
 will be passed on to git-buildpackage.
 
 Tagging, signing and actually uploading should be left to dgit push.


@@ -260,8 +260,8 @@ Use
 for signing the tag and the upload.  The default comes from the
 distro's
 .B keyid
 for signing the tag and the upload.  The default comes from the
 distro's
 .B keyid

-config setting (see CONFIGURATION, below), or failing that, gnupg's
-default.
+config setting (see CONFIGURATION, below), or failing that, the
+uploader trailer line in debian/changelog.

 .TP
 .BR --no-sign
 does not sign tags or uploads (meaningful only with push).
 .TP
 .BR --no-sign
 does not sign tags or uploads (meaningful only with push).


@@ -430,6 +430,7 @@ Specifies alternative programs to use instead of
 .BR gpg ,
 .BR ssh ,
 .BR dgit ,
 .BR gpg ,
 .BR ssh ,
 .BR dgit ,

+.BR git ,

 or
 .BR mergechanges .
 
 or
 .BR mergechanges .
 


@@ -476,6 +477,10 @@ this applies only when the program is invoked directly by dgit.
 Usually, for passing options to dpkg-genchanges, you should use
 .BR --ch: \fIoption\fR.
 
 Usually, for passing options to dpkg-genchanges, you should use
 .BR --ch: \fIoption\fR.
 

+Specifying --git 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.
 
 NB that --gpg:option is not supported (because debsign does not
 See notes above regarding ssh and dgit.
 
 NB that --gpg:option is not supported (because debsign does not