X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=strategy.tex;h=bfd392224d6e5c854573b4988f4314fd66d40530;hb=9ad96b436e0c1ddc5c4fb5074c588644e88c0bae;hp=1e8ee0156f5846bec3d54e4852396c703c432564;hpb=eb02216495da42d7de57d8ecf16b62dd50d2baf2;p=topbloke-formulae.git diff --git a/strategy.tex b/strategy.tex index 1e8ee01..bfd3922 100644 --- a/strategy.tex +++ b/strategy.tex @@ -74,7 +74,7 @@ All the input commits to the update algorithm. (See below.) The topmost patch which we are trying to update. This and all of its dependencies will be updated. -\item[ $h : \pc^{+/-} \mapsto \set H_{\pc^{+/-}}$ ] +\item[ $h : \pc^{+/-} \mapsto \set H^{\pc^{+/-}}$ ] Function for getting the existing heads $\set H$ of the branch $\pc^{+/-}$. These are the heads which will be merged and used in this update. This will include the current local and remote git refs, as desired. @@ -104,8 +104,8 @@ during the update algorithm). \item[ $\tipcn, \tipcy$ ] The new tips of the git branches $\pcn$ and $\pcy$, containing -all the correct commits (and the correct other patches), as -generated by the Traversal phase of the update algorithm. +all the appropriate commits (and the appropriate other patches), +as generated by the Traversal phase of the update algorithm. \end{basedescript}