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:
3d2ac5d
)
mention that merge can be used for dependency reinsertion
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Thu, 15 Mar 2012 19:19:07 +0000
(19:19 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Thu, 15 Mar 2012 19:19:07 +0000
(19:19 +0000)
article.tex
patch
|
blob
|
history
diff --git
a/article.tex
b/article.tex
index 4af8e0531ea2a659c79755b407b8e6ae7f772a49..dc0ca18db3e09445c53e962b05e508821199b607 100644
(file)
--- a/
article.tex
+++ b/
article.tex
@@
-800,6
+800,9
@@
Merge commits $L$ and $R$ using merge base $M$:
\end{gather}
We will occasionally use $X,Y$ s.t. $\{X,Y\} = \{L,R\}$.
\end{gather}
We will occasionally use $X,Y$ s.t. $\{X,Y\} = \{L,R\}$.
+This can also be used for dependency re-insertion, by setting
+$L \in \pn$, $R \in \pry$, $M = \baseof{R}$.
+
\subsection{Conditions}
\[ \eqn{ Ingredients }{
M \le L, M \le R
\subsection{Conditions}
\[ \eqn{ Ingredients }{
M \le L, M \le R