X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit-maint-merge.7.pod;h=642b39ece3b39e8a55ec22e5413bd16f692c6dfe;hb=78d88ae748be1bfed6420eed39cc4cd7b7b2870a;hp=d9dcb51075fa91ddca8a74c4c5225df7ea5e622d;hpb=b6c1636360fdbfb9461635241ee6f6bef7fed964;p=dgit.git

diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index d9dcb510..642b39ec 100644
--- a/dgit-maint-merge.7.pod
+++ b/dgit-maint-merge.7.pod
@@ -52,6 +52,16 @@ compress orig tarballs:
 
 =head1 INITIAL DEBIANISATION
 
+=head2 When upstream tags releases in git and releases identical tarballs
+
+Ideally upstream would make git tags, and tarball releases, which are
+completely identical to each other.  If this is the case then you can
+use the upstream tarballs directly.
+
+If you're not sure, use the procedure below under "When upstream
+releases only tarballs" only with a different upstream tag name.  Then
+use git diff to check that there are no differences.
+
 =head2 When upstream tags releases in git
 
 Suppose that the latest stable upstream release is 1.2.2, and this has
@@ -124,7 +134,7 @@ Now create I<debian/gbp.conf>:
 =over 4
 
     [DEFAULT]
-    upstream-branch = upsteram
+    upstream-branch = upstream
     debian-branch = master
     upstream-tag = %(version)s
 
@@ -184,7 +194,7 @@ changes to the upstream source:
 
 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 patch, rather than a series of quilt patches.
+squashed into a single diff, rather than a series of quilt patches.
 To obtain a patch queue for package version 1.2.3-1:
 
 =over 4
@@ -296,7 +306,11 @@ We create a DFSG-clean tag to merge to master:
 Before merging the new 1.2.3+dfsg tag to master, you should first
 determine whether it would be legally dangerous for the non-free
 material to be publicly accessible in the git history on
-B<dgit-repos>.  If it would be, pass B<--squash> to git-merge(1).
+B<dgit-repos>.
+If it would be dangerous, there is a big problem;
+in this case please consult your archive administrators
+(for Debian this is the dgit administrator dgit-owner@debian.org
+and the ftpmasters ftpmaster@ftp-master.debian.org).
 
 =head2 When upstream releases only tarballs
 
@@ -362,4 +376,4 @@ dgit(1), dgit(7)
 
 =head1 AUTHOR
 
-This tutorial was written and is maintained by Sean Whitton <spwhitton@spwhitton.name>.
+This tutorial was written and is maintained by Sean Whitton <spwhitton@spwhitton.name>.  It contains contributions from other dgit contributors too - see the dgit copyright file.