X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=dgit-maint-merge.7.pod;h=47ac4a07143e75144dc9220615b4bdcfa4c0be46;hp=5b425b55412a0dddb50bfb98efe5cbca5375c0ac;hb=d98e1bbf6968d643e82a4ebb9a07686eaf0aae7c;hpb=e130cf4a250a8aa7ce60db171b5895688c60c918

diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 5b425b55..47ac4a07 100644
--- a/dgit-maint-merge.7.pod
+++ b/dgit-maint-merge.7.pod
@@ -23,7 +23,9 @@ the usefulness of the raw Debian source package.  The Debian archive
 is thought of as an output format.
 
 For example, we don't spend time curating a series of quilt patches.
-However, the information such a series would contain is readily
+However,
+in straightforward cases,
+the information such a series would contain is readily
 available from B<dgit-repos>.
 
 =item
@@ -34,6 +36,17 @@ that upstream makes available for download.
 
 =back
 
+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.
+For such a workflow see for example
+dgit-maint-gbp(7).
+
 =head1 INITIAL DEBIANISATION
 
 This section explains how to start using this workflow with a new
@@ -230,21 +243,27 @@ changes to the upstream source:
 
 =over 4
 
-The Debian packaging of foo is maintained using dgit.  For the sake of
-an efficient workflow, Debian modifications to the upstream source are
-squashed into a single diff, rather than a series of quilt patches.
-To obtain a patch queue for package version 1.2.3-1:
+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.
+
+A detailed break down of these 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
+first upload of upstream version 1.2.3, you could use:
 
 =over 4
 
-    # apt-get install dgit
-    % dgit clone foo
+    % git clone https://git.dgit.debian.org/
     % cd foo
     % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian'
 
 =back
 
-See dgit(1), dgit(7) and dgit-maint-merge(7) for more information.
+See dgit-maint-merge(7) for more information.
+(If you have dgit, use dgit clone foo,
+rather than plain git clone.)
 
 =back