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:
5c02a85
)
strategy: notational fix
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 28 May 2012 00:11:52 +0000
(
01:11
+0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 28 May 2012 00:11:52 +0000
(
01:11
+0100)
strategy.tex
patch
|
blob
|
history
diff --git
a/strategy.tex
b/strategy.tex
index 1e8ee0156f5846bec3d54e4852396c703c432564..c870cfbcfe4f77ecf430531d585f51712146076f 100644
(file)
--- a/
strategy.tex
+++ b/
strategy.tex
@@
-74,7
+74,7
@@
All the input commits to the update algorithm. (See below.)
The topmost patch which we are trying to update. This and
all of its dependencies will be updated.
-\item[ $h : \pc^{+/-} \mapsto \set H
_
{\pc^{+/-}}$ ]
+\item[ $h : \pc^{+/-} \mapsto \set H
^
{\pc^{+/-}}$ ]
Function for getting the existing heads $\set H$ of the branch $\pc^{+/-}$.
These are the heads which will be merged and used in this update.
This will include the current local and remote git refs, as desired.