diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2018-04-19 09:20:49 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2018-04-19 09:43:59 -0700 |
commit | 0df581dab31cc84a16974992d3c449197a2c00b3 (patch) | |
tree | ee83f90f97fb0ae7f4729f1cda083fd0874b82c4 | |
parent | 944f532e615c416a2dd16a617f948b2f89a6f0de (diff) |
dgit-maint-debrebase(7): improve "Upstream branches"
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
-rw-r--r-- | dgit-maint-debrebase.7.pod | 17 |
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 --- a/dgit-maint-debrebase.7.pod +++ b/dgit-maint-debrebase.7.pod @@ -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 |