=over 4
[DEFAULT]
- upstream-branch = upsteram
+ upstream-branch = upstream
debian-branch = master
upstream-tag = %(version)s
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