summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2017-01-22 11:23:29 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2017-01-22 17:29:43 +0000
commit9982c588e3ea91d792e50d0643cb5ae9e1ff8e4e (patch)
tree194673d08fafd339546ddb22709877d677999cbd
parentcac1f2ebe6f1909954fabab163b303e230245dc2 (diff)
dgit-maint-merge(7): updates re #852090: suggestions by Sean
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r--dgit-maint-merge.7.pod6
1 files changed, 1 insertions, 5 deletions
diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 83bc973..3587dcd 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.)