From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 10 Aug 2013 13:05:08 +0000 (+0100)
Subject: pseudomerge: commentary about foreign apparently-pseudo merges
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=28ed5bb07153a37a5e48c9bfa7498eb48b946abf

pseudomerge: commentary about foreign apparently-pseudo merges
---

diff --git a/article.tex b/article.tex
index 2ee3759..b37f9a5 100644
--- a/article.tex
+++ b/article.tex
@@ -7,6 +7,7 @@
 \usepackage{amsfonts}
 \usepackage{eufrak}
 \usepackage{mdwlist}
+\usepackage{hyperref}
 %\usepackage{lastpage}
 %\usepackage{accents}
 
diff --git a/merge.tex b/merge.tex
index 5bb0db2..881dd24 100644
--- a/merge.tex
+++ b/merge.tex
@@ -1,4 +1,5 @@
 \section{Merge}
+\label{commit-merge}
 
 Merge commits $L$ and $R$ using merge base $M$:
 \gathbegin
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: