X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=blobdiff_plain;f=notation.tex;h=352781a8202a1799fad747d827a416fd5e3ed23f;hp=2f310bd612d6437700709b3b6d2b9a524f5a20f2;hb=b1adf56763bea8bb31f2b2113b0718be0dd0bc3a;hpb=a8c0dda901340bdd4fb4ca3464f0572c0cab3bd4

diff --git a/notation.tex b/notation.tex
index 2f310bd..352781a 100644
--- a/notation.tex
+++ b/notation.tex
@@ -49,15 +49,20 @@ $ \pendsof{C}{\pn} = \{ \baseof{C} \} $ where $ C \in \py $.
 A partial function from commits to commits.
 See Unique Base, below.
 
-\item[ $ C \haspatch \p $ ]
-$\displaystyle \bigforall_{D \in \py} D \isin C \equiv D \le C $.
-~ Informally, $C$ has all the reachable contents of $\p$.
-
 \item[ $ C \nothaspatch \p $ ]
 $\displaystyle \bigforall_{D \in \py} D \not\isin C $.
 ~ Informally, $C$ has none of the contents of $\p$.
 
-Note that $\haspatch$ and $\nothaspatch$ are not mutually exclusive.
+\item[ $ C \zhaspatch \p $ ]
+$\displaystyle \bigforall_{D \in \py} D \isin C \equiv D \le C $.
+~ Informally, $C$ has all the reachable contents of $\p$.
+
+\item[ $ C \haspatch \p $ ]
+$\displaystyle C \zhaspatch \p \land \exists_{F \in \py} F \le C $.
+~ Informally, $C$ nontrivially has all the reachable contents of $\p$.
+
+Note that $\zhaspatch$ and $\nothaspatch$ are not mutually exclusive.
+$\haspatch$ and $\nothaspatch$ are.
 
 Commits on Non-Topbloke branches are $\nothaspatch \p$ for all $\p$.  This
 includes commits on plain git branches made by applying a Topbloke