define patch

[topbloke-formulae.git] / article.tex

diff --git a/article.tex b/article.tex
index ac351fb6366734cafd90fc5357cc59c7bc267c64..0a411723ffb858cfa09eb869d6f01831628f1db7 100644 (file)
--- a/article.tex
+++ b/article.tex
@@ -67,6 +67,13 @@ anticommits, the ``change made'' is only to be thought of as any
 conflict resolution.  This is not a partial order because it is not
 transitive.
 
+\item[ $ \p, \py, \pn $ ]
+A patch $\p$ consists of two sets of commits $\pn$ and $\py$, which
+are respectively the base and tip git branches.  $\p$ may be used
+where the context requires a set, in which case the statement
+is to be taken as applying to both $\py$ and $\pn$
+All these sets are distinct.
+
 \end{basedescript}
 
 \section{Invariants}