summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2013-10-09 08:43:11 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2013-10-09 08:43:11 +0100
commit1a0af5412f153e24462cdb1ec41a378975376d0c (patch)
tree6c2ab3a547ac743e73524107ec7a3d78b5e526e8
parentd51d076759bf65a31b74829e9afce28353b2379b (diff)
finish documenting --dgit
-rw-r--r--TODO1
-rw-r--r--dgit.19
2 files changed, 8 insertions, 2 deletions
diff --git a/TODO b/TODO
deleted file mode 100644
index bf48ebc..0000000
--- a/TODO
+++ /dev/null
@@ -1 +0,0 @@
---dgit= etc. @dgit should be in manual
diff --git a/dgit.1 b/dgit.1
index 11e2a5d..02d54a3 100644
--- a/dgit.1
+++ b/dgit.1
@@ -238,12 +238,18 @@ Specifies alternative programs to use instead of
.BR sbuild ,
.BR gpg ,
.BR ssh ,
+.BR dgit ,
or
.BR mergechanges .
For dpkg-buildpackage, dpkg-genchanges, mergechanges and sbuild,
this applies only when the program is invoked directly by dgit.
+For dgit, specifies the command to run on the remote host when dgit
+rpush needs to invoke a remote copy of itself. (dgit also reinvokes
+itself as the EDITOR for dpkg-source --commit; this is done using
+argv[0], and is not affected by --dget=).
+
For ssh, the default value is taken from the
.B DGIT_SSH
or
@@ -269,6 +275,7 @@ Specifies a single additional option to pass to
.BR dpkg-genchanges ,
.BR sbuild ,
.BR ssh ,
+.BR dgit ,
or
.BR mergechanges .
Can be repeated as necessary.
@@ -278,7 +285,7 @@ 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.
-See note above regarding ssh.
+See notes above regarding ssh and dgit.
NB that --gpg:option is not supported (because debsign does not
have that facility). But see -k.