X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=blobdiff_plain;f=pseudomerge.tex;h=9ea20452abed952f324ac3a32e9e6ade913de286;hp=24c05ae68efa63266b20eb3d37dc6b4fce786a1c;hb=28ed5bb07153a37a5e48c9bfa7498eb48b946abf;hpb=c3b1d7b775527e0ceb1c9a2443cc7e7cc5fed2ef

diff --git a/pseudomerge.tex b/pseudomerge.tex
index 24c05ae..9ea2045 100644
--- a/pseudomerge.tex
+++ b/pseudomerge.tex
@@ -45,6 +45,11 @@ $\isforeign{D} \implies \big[ D \le C \equiv D \le L \big]$.
 Trivial by Foreign Unaffected and the definition of $\pends$
 }
 
+It might seem that bare git commits might also be psuedo-merges ---
+e.g., merges made directly with {\tt git merge -s ours}.  However, by
+our definition of $\has$, these are considered simply as normal merges
+(\autoref{commit-merge}).
+
 \subsection{No Replay}
 
 Ingredients Prevent Replay applies: