chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
debian/changelog: Document dgit-maint-merge(7)
[dgit.git]
/
dgit-maint-merge.7.pod
diff --git
a/dgit-maint-merge.7.pod
b/dgit-maint-merge.7.pod
index 7391daf5995b33b0549f1dc5032eb8c57a77dcb3..71f701e196a2196db084db9c106587b269a424a3 100644
(file)
--- a/
dgit-maint-merge.7.pod
+++ b/
dgit-maint-merge.7.pod
@@
-134,7
+134,7
@@
Now create I<debian/gbp.conf>:
=over 4
[DEFAULT]
=over 4
[DEFAULT]
- upstream-branch = upst
er
am
+ upstream-branch = upst
re
am
debian-branch = master
upstream-tag = %(version)s
debian-branch = master
upstream-tag = %(version)s
@@
-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
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
=head2 When upstream releases only tarballs