dgit-maint-debrebase(7): improve "Upstream branches"

[dgit.git] / dgit-maint-debrebase.7.pod

diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod
index b17833e2353c422ea8619421b31faa77dc06d39d..e78f5f28eaf220ae2b0f3650149c710ec81bd9cf 100644 (file)
--- a/dgit-maint-debrebase.7.pod
+++ b/dgit-maint-debrebase.7.pod
@@ -559,16 +559,23 @@ git-debrebase(1).  You should not make changes there.  They will
 either cause trouble, or be ignored and overwritten by
 git-debrebase(1).
 
 either cause trouble, or be ignored and overwritten by
 git-debrebase(1).
 

+I<debian/patches> will often be out-of-date because git-debrebase(1)
+will only regenerate it when it needs to.  So you should not rely on
+the information in that directory.  When preparing patches to forward
+upstream, you should use git-format-patch(1) on git commits, rather
+than sending files from I<debian/patches>.
+

 =head2 Upstream branches
 
 =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.
+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 thought behind this is that from Debian's point of view, upstream
-releases are immutable points in history, better represented by tags.
+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
 
 
 =head2 The first ever dgit push