From 1b0eeef7759be1fc1f0f856166c4ee0eb3769ff8 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 1 Mar 2012 00:11:46 +0000 Subject: [PATCH] define patch --- article.tex | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/article.tex b/article.tex index ac351fb..0a41172 100644 --- 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} -- 2.30.2