chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rpush: Introduce more sophisticated protocol negotiation.
[dgit.git]
/
dgit.1
diff --git
a/dgit.1
b/dgit.1
index 05a9cd141ad8ae9bdc0b9040e45c7095ad3032aa..77d325204d61b1397e4c7fd0c3ff09c1f6b621a3 100644
(file)
--- a/
dgit.1
+++ b/
dgit.1
@@
-126,7
+126,7
@@
Print a usage summary.
Constructs the source package, uses
.B sbuild
to do a binary build, and uses mergechanges to merge the source and
Constructs the source package, uses
.B sbuild
to do a binary build, and uses mergechanges to merge the source and
-binary changes files. Options and argum
m
ents after sbuild will be
+binary changes files. Options and arguments after sbuild will be
passed on to sbuild. Changes files matching
.IB package _ version _*.changes
in the parent directory will be removed; the output is left in
passed on to sbuild. Changes files matching
.IB package _ version _*.changes
in the parent directory will be removed; the output is left in
@@
-137,7
+137,7
@@
Tagging, signing and actually uploading should be left to dgit push.
\fBdgit git-build\fR ...
Runs
.B git-buildpackage
\fBdgit git-build\fR ...
Runs
.B git-buildpackage
-with some suitable options. Options and argum
m
ents after git-build
+with some suitable options. Options and arguments after git-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.
@@
-243,7
+243,11
@@
servers.
.BI -k keyid
Use
.I keyid
.BI -k keyid
Use
.I keyid
-for signing the tag and the upload.
+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.
.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).
@@
-302,8
+306,10
@@
The build-dependencies are not checked (due to
which violates policy, but may work in practice.
.TP
.BR -N " | " --new
which violates policy, but may work in practice.
.TP
.BR -N " | " --new
-The package may be new in this suite. Without this, dgit will
-refuse to push.
+The package is or may be new in this suite. Without this, dgit will
+refuse to push. It may (for Debian, will) be unable to access the git
+history for any packages which have been newly pushed and have not yet
+been published.
.TP
.BR --ignore-dirty
Do not complain if the working tree does not match your git HEAD.
.TP
.BR --ignore-dirty
Do not complain if the working tree does not match your git HEAD.
@@
-459,7
+465,12
@@
Usually, for passing options to dpkg-genchanges, you should use
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
-have that facility). But see -k.
+have that facility).
+But see
+.B -k
+and the
+.B keyid
+distro config setting.
.TP
.BR -d "\fIdistro\fR | " --distro= \fIdistro\fR
Specifies that the suite to be operated on is part of distro
.TP
.BR -d "\fIdistro\fR | " --distro= \fIdistro\fR
Specifies that the suite to be operated on is part of distro
@@
-612,6
+623,8
@@
but, setting this to false will avoid relying on the mirror of the dgit
git repository server.
.TP
.BI dgit-distro. distro .keyid
git repository server.
.TP
.BI dgit-distro. distro .keyid
+See also
+.BR -k .
.TP
.BI dgit-distro. distro .mirror " url"
.TP
.TP
.BI dgit-distro. distro .mirror " url"
.TP