X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit.1;h=88e98128b43a404d121ec17b6570a36ba23271b1;hp=e8f7eb233dab4bc976b46f6c1d9019dea3f778d5;hb=34740893d752bcabccfa7d0e360e84143342d20b;hpb=fc328b35ddc6e37c183383d5f8c6bb973dd0cc9b diff --git a/dgit.1 b/dgit.1 index e8f7eb23..88e98128 100644 --- 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 -\fBdgit git-build\fR ... +\fBdgit gbp-build\fR ... 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. @@ -260,8 +260,8 @@ Use 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). @@ -430,6 +430,7 @@ Specifies alternative programs to use instead of .BR gpg , .BR ssh , .BR dgit , +.BR git , 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. +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