This will include the current local and remote git refs, as desired.
Obtained from the function $h$ (see below).
+\item[ $W$ ]
+
+During the Traversal phase, when we generate new commits, the working
+head of the branch we are working on. Starts at $W_0$, updated as the
+algorithm progresses, and ultimately used to set $T$.
+
%\item[ $\set E_{\pc}$ ]
%$ \bigcup_i \pendsof{S_{\pc,i}}{\pc} $.
%All the ends of $\pc$ in the sources.
\item[ $h : \pc^{+/-} \mapsto \set H^{\pc^{+/-}}$ ]
Function for getting the existing heads $\set H$ of the branch $\pc^{+/-}$.
-\item[ $w : \pc^{+/-} \mapsto \set W_0^{\pc^{+/-}}$ ]
+\item[ $w : \pc^{+/-} \mapsto W_0^{\pc^{+/-}}$ ]
Function for getting the existing local head of the branch
$\pc^{+/-}$. I.e., the current value of the branch ref for $\pc^{+/-}$.
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}