strategy: define O^P^-

diff --git a/article.tex b/article.tex
index b37f9a59d32379b3d99d30e622cf1256b058b499..45510aa70d507d9daddd33c5b01306e983f40848 100644 (file)
--- a/article.tex
+++ b/article.tex
@@ -143,6 +143,7 @@
 \newcommand{\tipdn}{ \tipa \pdn }
 \newcommand{\tipdy}{ \tipa \pdy }
 
+\newcommand{\tippn}{ \tipa \pn }
 \newcommand{\tippy}{ \tipa \py }
 
 %\newcommand{\bigforall}{\mathop{\hbox{\huge$\forall$}}}

diff --git a/strategy.tex b/strategy.tex
index 2f676bb7808acc38e7e6033cf437d260fd6a178f..e12ff66afbbdc142eb4001b2778387735bfccd0f 100644 (file)
--- a/strategy.tex
+++ b/strategy.tex
@@ -130,8 +130,9 @@ $\allreach$ varies over time as we generate more commits.  Each
 commit we generate will have only reachable commits as ancestors, so
 generating a new commit (only) adds that new commit to $\allreach$.
 
-\item[ $\allreachof{\py}$ ]
-The set of reachable commits at the point where we have just generated
-$\tippy$, i.e. just after $\alg{Merge-Tip}(\p)$.
+\item[ $\allreachof{\pn}$, $\allreachof{\py}$ ]
+The sets of reachable commits at the point where we have just generated
+$\tippn$ or $\tippy$, i.e. just after $\alg{Merge-Base}(\p)$ or
+$\alg{Recreate-Base}(\p)$, or $\alg{Merge-Tip}(\p)$, respectively.
 
 \end{basedescript}