From 9982c588e3ea91d792e50d0643cb5ae9e1ff8e4e Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 22 Jan 2017 11:23:29 +0000 Subject: [PATCH 1/1] dgit-maint-merge(7): updates re #852090: suggestions by Sean Signed-off-by: Ian Jackson --- dgit-maint-merge.7.pod | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod index 83bc9736..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,7 +258,6 @@ 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.) -- 2.30.2