summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-07-20 13:41:27 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2015-07-20 13:41:27 +0100
commitb49212f0b194ccbb483e213d14e97ed53da36e2b (patch)
treea80433957cff281960ed772a529d301cf2bf728a
parent1067f7e8771822d3279da1d807dcb2c8e37f5f40 (diff)
Manpage: Better cross-references for -k and keyid.
-rw-r--r--debian/changelog1
-rw-r--r--dgit.115
2 files changed, 14 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index dfcfcbd..dea72b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ dgit (1.1) unstable; urgency=low
to dgit history.
* Remove stray sentence in config section of manpage.
* Manpage: Clarify wording of readonly config.
+ * Manpage: Better cross-references for -k and keyid.
--
diff --git a/dgit.1 b/dgit.1
index 05a9cd1..60e6a25 100644
--- a/dgit.1
+++ b/dgit.1
@@ -243,7 +243,11 @@ servers.
.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).
@@ -459,7 +463,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
-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
@@ -612,6 +621,8 @@ but, setting this to false will avoid relying on the mirror of the dgit
git repository server.
.TP
.BI dgit-distro. distro .keyid
+See also
+.BR -k .
.TP
.BI dgit-distro. distro .mirror " url"
.TP