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
(from parent 1:
c880c46
)
pseudomerge: fix terminology for foreign commits
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 10 Aug 2013 19:21:37 +0000
(20:21 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 10 Aug 2013 19:21:37 +0000
(20:21 +0100)
pseudomerge.tex
patch
|
blob
|
history
diff --git
a/pseudomerge.tex
b/pseudomerge.tex
index c1a88f8c6dc170be2e451902101dcc6ebebb5970..b4022da86f6311b91e27b7faaea1e0cff43d2019 100644
(file)
--- 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}).