|author||Sean Whitton <firstname.lastname@example.org>||2018-04-19 09:20:49 -0700|
|committer||Sean Whitton <email@example.com>||2018-04-19 09:43:59 -0700|
dgit-maint-debrebase(7): improve "Upstream branches"
Signed-off-by: Sean Whitton <firstname.lastname@example.org>
1 files changed, 9 insertions, 8 deletions
diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod
index 6d14c0b..e78f5f2 100644
@@ -567,14 +567,15 @@ than sending files from I<debian/patches>.
=head2 Upstream branches
-Except in the case where upstream releases only tarballs, we do not
-maintain a separate 'upstream' branch (unless you also happen to be
-involved in upstream development). We work with upstream tags rather
-than any branches, except temporary branches used to prepare patches
-for forwarding upstream, for example.
-The thought behind this is that from Debian's point of view, upstream
-releases are immutable points in history, better represented by tags.
+Except in the case where upstream releases only tarballs, or we
+require DFSG filtering, we do not maintain a separate 'upstream'
+branch (unless you also happen to be involved in upstream
+development). We work with upstream tags rather than any branches
+(except temporary branches used to prepare patches for forwarding
+upstream, for example).
+The idea here is that from Debian's point of view, upstream releases
+are immutable points in history, and so better represented by tags.
=head2 The first ever dgit push