diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-11-08 22:10:28 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-11-08 22:10:29 +0000 |
commit | fd6adbbf2635ee146d630248f3129b1a4973b7e1 (patch) | |
tree | 1c347a4b959672902763058a24269a8cf8adf834 /dgit.1 | |
parent | fd0923f31bbc48c0ba822033b2255115f0cab1ce (diff) |
dgit(1), dgit(7): Better reference docs for combined suites.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit.1')
-rw-r--r-- | dgit.1 | 25 |
1 files changed, 4 insertions, 21 deletions
@@ -74,23 +74,9 @@ for the distro to which belongs. .I suite -may be -.IR mainsuite \fB,\fR subsuite ... -in which case dgit will synthesize a view giving the most -recent version in any of the specified suites. -(The subsuites do not need to have the package.) -If a subsuite starts with -.B - -then mainsuite is prepended. -Each of the suite names will be individually canonicalised -to calculate the canonical branch names to use. -When using this facility, it is important to always specify the -same suites in the same order: -dgit will not be make a coherent fast-forwarding history -view otherwise. -The history generated by this feature is not normally suitable -for merging back into upstreams, -as it necessarily contains unattractive pseudomerges. +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 @@ -109,10 +95,7 @@ then dgit fetch defaults to .IR suite ; otherwise it parses debian/changelog and uses the suite specified there. - -suite may be -.IR mainsuite \fB,\fR subsuite ... -as for clone. +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 |