From: Sean Whitton Date: Thu, 19 Apr 2018 16:20:49 +0000 (-0700) Subject: dgit-maint-debrebase(7): improve "Upstream branches" X-Git-Tag: archive/debian/5.0~6^2~9 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=0df581dab31cc84a16974992d3c449197a2c00b3;ds=sidebyside dgit-maint-debrebase(7): improve "Upstream branches" Signed-off-by: Sean Whitton --- diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod index 6d14c0be..e78f5f28 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