changelog: start 3.12~

[dgit.git] / dgit-maint-merge.7.pod

diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 47ac4a07143e75144dc9220615b4bdcfa4c0be46..3da1b78538cd5eba22e805e033d98cde4ce47926 100644 (file)
--- 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).
 
@@ -238,16 +235,16 @@ source package format.
 
 =head2 Sample text for debian/source/patch-header
 
-It is a good idea to explain how a user can obtain a break down of the
+It is a good idea to explain how a user can obtain a breakdown of the
 changes to the upstream source:
 
 =over 4
 
 The Debian packaging of foo is maintained in git,
 using the merging workflow described in dgit-maint-merge(7).
-An automatically generated representation of the Debian changes follows.
+There isn't a patch queue that can be represented as a quilt series.
 
-A detailed break down of these changes is available from their
+A detailed breakdown of the changes is available from their
 canonical representation -
 git commits in the packaging repository.
 For example, to see the changes made by the Debian maintainer in the
@@ -255,15 +252,16 @@ first upload of upstream version 1.2.3, you could use:
 
 =over 4
 
-    % git clone https://git.dgit.debian.org/
+    % git clone https://git.dgit.debian.org/foo
     % cd foo
     % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian'
 
 =back
 
-See dgit-maint-merge(7) for more information.
-(If you have dgit, use dgit clone foo,
-rather than plain git clone.)
+(If you have dgit, use `dgit clone foo`,
+rather than plain `git clone`.)
+
+A single combined diff, containing all the changes, follows.
 
 =back