chiark
/
gitweb
/
~ian
/
topbloke-formulae.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
72c5bcb
)
Rename \merge to \mergeof so we can have \merge
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Tue, 6 Mar 2012 14:33:33 +0000
(14:33 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Tue, 6 Mar 2012 14:33:33 +0000
(14:33 +0000)
article.tex
patch
|
blob
|
history
diff --git
a/article.tex
b/article.tex
index 20ab3613b294a18dd8bf09d8f49e4f7bc9ab8700..0e3732d7c5f0ec97f17143a477aea7a1c6eb5d90 100644
(file)
--- a/
article.tex
+++ b/
article.tex
@@
-55,7
+55,8
@@
\newcommand{\pancsof}[2]{\pancs ( #1 , #2 ) }
\newcommand{\pendsof}[2]{\pends ( #1 , #2 ) }
\newcommand{\pancsof}[2]{\pancs ( #1 , #2 ) }
\newcommand{\pendsof}[2]{\pends ( #1 , #2 ) }
-\newcommand{\merge}[4]{{\mathcal M}(#1,#2,#3,#4)}
+\newcommand{\merge}{{\mathcal M}}
+\newcommand{\mergeof}[4]{\merge(#1,#2,#3,#4)}
%\newcommand{\merge}[4]{{#2 {{\frac{ #1 }{ #3 } #4}}}}
\newcommand{\patch}{{\mathcal P}}
%\newcommand{\merge}[4]{{#2 {{\frac{ #1 }{ #3 } #4}}}}
\newcommand{\patch}{{\mathcal P}}
@@
-154,7
+155,7
@@
patch is applied to a non-Topbloke branch and then bubbles back to
the Topbloke patch itself, we hope that git's merge algorithm will
DTRT or that the user will no longer care about the Topbloke patch.
the Topbloke patch itself, we hope that git's merge algorithm will
DTRT or that the user will no longer care about the Topbloke patch.
-\item[ $\displaystyle \merge{C}{L}{M}{R} $ ]
+\item[ $\displaystyle \merge
of
{C}{L}{M}{R} $ ]
The contents of a git merge result:
$\displaystyle D \isin C \equiv
The contents of a git merge result:
$\displaystyle D \isin C \equiv
@@
-263,7
+264,7
@@
XXX proof TBD.
If we are constructing $C$, given
\gathbegin
If we are constructing $C$, given
\gathbegin
- \merge{C}{L}{M}{R}
+ \merge
of
{C}{L}{M}{R}
\gathnext
L \le C
\gathnext
\gathnext
L \le C
\gathnext
@@
-399,7
+400,7
@@
Used for removing a branch dependency.
\gathnext
\patchof{C} = \patchof{L}
\gathnext
\gathnext
\patchof{C} = \patchof{L}
\gathnext
- \merge{C}{L}{R^+}{R^-}
+ \merge
of
{C}{L}{R^+}{R^-}
\end{gather}
\subsection{Conditions}
\end{gather}
\subsection{Conditions}
@@
-450,7
+451,7
@@
Merge commits $L$ and $R$ using merge base $M$ ($M < L, M < R$):
\gathnext
\patchof{C} = \patchof{L}
\gathnext
\gathnext
\patchof{C} = \patchof{L}
\gathnext
- \merge{C}{L}{M}{R}
+ \merge
of
{C}{L}{M}{R}
\end{gather}
\subsection{Conditions}
\end{gather}
\subsection{Conditions}