X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit.1;h=33d24a95a11b831b8712d9859cfeba1e47a0c9e7;hp=07eb89c16e651da9582e9c503140f74dd47c0dd0;hb=0c130d5e2e33cd8bed0ba0318c62591dabfc3467;hpb=5dd559b5eaedf57a1081c03ab8602669c9e72e4a diff --git a/dgit.1 b/dgit.1 index 07eb89c1..33d24a95 100644 --- a/dgit.1 +++ b/dgit.1 @@ -73,6 +73,11 @@ for the distro to which .I suite belongs. +.I suite +may be a combination of several underlying suites in the form +.IR mainsuite \fB,\fR subsuite ...; +see COMBINED SUITES in dgit(7). + For your convenience, the .B vcs-git remote will be set up from the package's Vcs-Git field, if there is @@ -90,6 +95,7 @@ then dgit fetch defaults to .IR suite ; otherwise it parses debian/changelog and uses the suite specified there. +suite may be a combined suite, as for clone. .TP \fBdgit pull\fR [\fIsuite\fP] Does dgit fetch, and then merges the new head of the remote tracking @@ -181,15 +187,14 @@ current directory; however, signing operations are done on the invoking host. This allows you to do a push when the system which has the source code and the build outputs has no access to the key: +.TS +l l. 1. Clone on build host (dgit clone) -.br 2. Edit code on build host (edit, git commit) -.br 3. Build package on build host (dgit build) -.br 4. Test package on build host or elsewhere (dpkg -i, test) -.br 5. Upload by invoking dgit rpush on host with your GPG key. +.TE However, the build-host must be able to ssh to the dgit repos. If this is not already the case, you must organise it separately, for @@ -710,6 +715,8 @@ Specifies a single additional option to pass to .BR sbuild , .BR ssh , .BR dgit , +.BR apt-get , +.BR apt-cache , .BR gbp-pq , .BR gbp-build , or @@ -755,6 +762,8 @@ Specifies alternative programs to use instead of .BR gpg , .BR ssh , .BR dgit , +.BR apt-get , +.BR apt-cache , .BR git , .BR gbp-pq , .BR gbp-build ,