-\section{Notation}
+\stdsection{Notation}
Throughout, any free variables are implicitly universally quantified
at the outermost level.
All of these sets will be disjoint by construction
(see Invariants, below). Hence:
+\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.
\item[ $ \patchof{ C } $ ]
-Either $\p$ s.t. $ C \in \p $, or $\bot$.
+Either $\p$ s.t. $ C \in \p $, or $\foreign$.
A function from commits to patches' sets $\p$.
\item[ $ \pancsof{C}{\set P} $ ]
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} $ ]
+\item[ $\displaystyle \commitmergeof{C}{L}{M}{R} $ ]
The contents of a git merge result:
$\displaystyle D \isin C \equiv