X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit-maint-merge.7.pod;h=3587dcdfd140e266b45d39e9538f858f04747fc4;hb=c8f9e9be604c623745f2218f9a1deed5c65dacbe;hp=b0f395d926e3952c9223dcb32cb0f94e8d0140bf;hpb=fda83f39806c1a476e208bb4f454401c063da121;p=dgit.git diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod index b0f395d9..3587dcdf 100644 --- a/dgit-maint-merge.7.pod +++ b/dgit-maint-merge.7.pod @@ -40,10 +40,7 @@ This workflow is less suitable for some packages. When the Debian delta contains multiple pieces which interact, or which you aren't going to be able to upstream soon, it might be preferable to -maintain the delta as a rebasing patch series, -to facilitate -reviewing/upstreaming/dropping -individual pieces. +maintain the delta as a rebasing patch series. For such a workflow see for example dgit-maint-gbp(7). @@ -261,11 +258,10 @@ first upload of upstream version 1.2.3, you could use: =back -See dgit-maint-merge(7) for more information. (If you have dgit, use dgit clone foo, rather than plain git clone.) -A single combined diff, representating all the changes, follows. +A single combined diff, containing all the changes, follows. =back