From 7d4857e62a0fc915143aeb943567476c13dfd0df Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 19 Oct 2016 18:29:28 +0100 Subject: dgit-maint-merge(7): Fiercer instructions about legally dangerous git history Signed-off-by: Ian Jackson --- dgit-maint-merge.7.pod | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod index f8e33b2..71f701e 100644 --- a/dgit-maint-merge.7.pod +++ b/dgit-maint-merge.7.pod @@ -306,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. If it would be, pass B<--squash> to git-merge(1). +B. +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 -- cgit v1.2.3