notation: clarify git merge notations

[topbloke-formulae.git] / notation.tex

diff --git a/notation.tex b/notation.tex
index 19cf243733e1a9ba8edce18d7d7a70a8e0fb1097..929fece5a77de97db101045c72db74c5c13662c6 100644 (file)
--- a/notation.tex
+++ b/notation.tex
@@ -86,32 +86,33 @@ the relevant Topbloke branches, we hope that
 if the user still cares about the Topbloke patch,
 git's merge algorithm will DTRT when trying to re-apply the changes.
 
 if the user still cares about the Topbloke patch,
 git's merge algorithm will DTRT when trying to re-apply the changes.
 

-\item[ $\displaystyle \stmtmergeof{L}{M}{R} $ ]
+\item[ $\displaystyle \stmtmergeof{\stmt L}{\stmt M}{\stmt R} $ ]

 The proper results of a merge.  Formally,
 The proper results of a merge.  Formally,

-where $L$, $M$ and $R$ are statements:
+where $\stmt L$, $\stmt M$ and $\stmt R$ are statements:

 $$
 $$

-  \stmtmergeof{L}{M}{R}
+  \stmtmergeof{\stmt L}{\stmt M}{\stmt R}

     \equiv
   \begin{cases}
     \equiv
   \begin{cases}

-         (L \land R)      : & \true \\
-    (\neg L \land \neg R) : & \false \\
-    \text{otherwise} : & \neg M
+         (\stmt L \land \stmt R)      : & \true \\
+    (\neg \stmt L \land \neg \stmt R) : & \false \\
+    \text{otherwise} : & \neg \stmt M

   \end{cases}
 $$
 
   \end{cases}
 $$
 

-May also be used where $L$, $M$ and $R$ are sets, in which case
+May also be used with sets:

 $$
 $$

-  \setmergeof{L}{M}{R}
+  \setmergeof{\set L}{\set M}{\set R}

      =
   \left\{
     \;
     D \; \middle| \;
      =
   \left\{
     \;
     D \; \middle| \;

-      \setmergeof{ D \in L }{ D \in M }{ D \in R }
+      \setmergeof{ D \in \set L }{ D \in \set M }{ D \in \set R }

     \;
   \right\}
 $$
 
 \item[ $\displaystyle \commitmergeof{C}{L}{M}{R} $ ]
     \;
   \right\}
 $$
 
 \item[ $\displaystyle \commitmergeof{C}{L}{M}{R} $ ]

+With $C$, $L$, $M$ and $R$ being commits, a convenience notation.

 $C$ has exactly the contents of a git merge result:
 
 $\displaystyle D \isin C \equiv
 $C$ has exactly the contents of a git merge result:
 
 $\displaystyle D \isin C \equiv


@@ -121,6 +122,6 @@ $\displaystyle D \isin C \equiv
   \end{cases}
 $
 
   \end{cases}
 $
 

-We will refer to this as \commitmergename.
+We will refer to this as \bf\commitmergename.

 
 \end{basedescript}
 
 \end{basedescript}