clarify text re non-tb flattened re-inclusion

diff --git a/article.tex b/article.tex
index 25946fa8b789b313d36523473ec7bbf1cfbad406..862403f0115e33502da60ae68c5f83b82e95b484 100644 (file)
--- a/article.tex
+++ b/article.tex
@@ -152,10 +152,13 @@ $\displaystyle \bigforall_{D \in \py} D \isin C \equiv D \le C $.
 $\displaystyle \bigforall_{D \in \py} D \not\isin C $.
 ~ Informally, $C$ has none of the contents of $\p$.  
 
-Non-Topbloke commits are $\nothaspatch \p$ for all $\p$; if a Topbloke
+Non-Topbloke commits are $\nothaspatch \p$ for all $\p$.  This
+includes commits on plain git branches made by applying a Topbloke
+patch.  If a Topbloke
 patch is applied to a non-Topbloke branch and then bubbles back to
-the Topbloke patch itself, we hope that git's merge algorithm will
-DTRT or that the user will no longer care about the Topbloke patch.
+the relevant Topbloke branches, we hope that 
+if the user still cares about the Topbloke patch,
+git's merge algorithm will DTRT when trying to re-apply the changes.
 
 \item[ $\displaystyle \mergeof{C}{L}{M}{R} $ ]
 The contents of a git merge result: