diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-19 18:29:28 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2016-10-20 20:06:44 +0100 |
| commit | 7d4857e62a0fc915143aeb943567476c13dfd0df (patch) | |
| tree | 1ead8cb0469955b537f9cf0e9a342e95d3741934 /dgit-maint-merge.7.pod | |
| parent | 637480ca8b3557c346eb6b2eb690c09f2dc922a8 (diff) | |
dgit-maint-merge(7): Fiercer instructions about legally dangerous git history
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'dgit-maint-merge.7.pod')
| -rw-r--r-- | dgit-maint-merge.7.pod | 6 |
1 files changed, 5 insertions, 1 deletions
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<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 |