strategy: wip ends reachability

[topbloke-formulae.git] / notation.tex

diff --git a/notation.tex b/notation.tex
index f8f2b87973b9ad3740b7c4f4a595ac10e293c830..19cf243733e1a9ba8edce18d7d7a70a8e0fb1097 100644 (file)
--- a/notation.tex
+++ b/notation.tex
@@ -31,20 +31,20 @@ are respectively the base and tip git branches.  $\p$ may be used
 where the context requires a set, in which case the statement
 is to be taken as applying to both $\py$ and $\pn$.
 All of these sets will be disjoint by construction
-(see Invariants, below).  Hence:
+(see Invariants, below).
 
 \item[ $\foreign$ ]
 The set of all commits which are not part of a Topbloke branch.  We
-call these foreign commits.
-
-\item[ $\set A$, $\set P$, $\ldots$ ]
-Arbitrary sets of commits.  Maybe $\set P = \p$ i.e.\ some $\py$ or $\pn$, but
-maybe not.
+call these foreign commits.  Hence:
 
 \item[ $ \patchof{ C } $ ]
 Either $\p$ s.t. $ C \in \p $, or $\foreign$.
 A function from commits to patches' sets $\p$.
 
+\item[ $\set A$, $\set P$, $\ldots$ ]
+Arbitrary sets of commits.  Maybe $\set P = \p$ i.e.\ some $\py$ or $\pn$, but
+maybe not.
+
 \item[ $ \pancsof{C}{\set P} $ ]
 $ \{ A \; | \; A \le C \land A \in \set P \} $
 i.e. all the ancestors of $C$
@@ -112,7 +112,7 @@ $$
 $$
 
 \item[ $\displaystyle \commitmergeof{C}{L}{M}{R} $ ]
-The contents of a git merge result:
+$C$ has exactly the contents of a git merge result:
 
 $\displaystyle D \isin C \equiv
   \begin{cases}
@@ -121,4 +121,6 @@ $\displaystyle D \isin C \equiv
   \end{cases}
 $
 
+We will refer to this as \commitmergename.
+
 \end{basedescript}