From 0df581dab31cc84a16974992d3c449197a2c00b3 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Thu, 19 Apr 2018 09:20:49 -0700 Subject: dgit-maint-debrebase(7): improve "Upstream branches" Signed-off-by: Sean Whitton --- dgit-maint-debrebase.7.pod | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'dgit-maint-debrebase.7.pod') diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod index 6d14c0b..e78f5f2 100644 --- a/dgit-maint-debrebase.7.pod +++ b/dgit-maint-debrebase.7.pod @@ -567,14 +567,15 @@ than sending files from I. =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 -- cgit v1.2.3