dgit-maint-merge(7): Mention what to do if upstream make good tarballs

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 6d0db9919c356c56756094d91dc24b1c0c091ece..7391daf5995b33b0549f1dc5032eb8c57a77dcb3 100644 (file)
--- 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