From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 10 Aug 2013 19:21:37 +0000 (+0100)
Subject: pseudomerge: fix terminology for foreign commits
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke-formulae.git;a=commitdiff_plain;h=117c31e0202e39fc17f2f12c3690942d3c991cfd

pseudomerge: fix terminology for foreign commits
---

diff --git a/pseudomerge.tex b/pseudomerge.tex
index c1a88f8..b4022da 100644
--- a/pseudomerge.tex
+++ b/pseudomerge.tex
@@ -45,7 +45,7 @@ $\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 ---
+It might seem that foreign 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}).