chiark
/
gitweb
/
~ian
/
topbloke-formulae.git
/ shortlog
commit
grep
author
committer
pickaxe
?
search:
re
summary
| shortlog |
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
topbloke-formulae.git
2012-03-12
Ian Jackson
assert that exact ancestors is trivial
commit
|
commitdiff
|
tree
|
snapshot
2012-03-12
Ian Jackson
proof of alternative merge formulation
commit
|
commitdiff
|
tree
|
snapshot
2012-03-12
Ian Jackson
remove trailing ws
commit
|
commitdiff
|
tree
|
snapshot
2012-03-12
Ian Jackson
create tip
commit
|
commitdiff
|
tree
|
snapshot
2012-03-12
Ian Jackson
simple commit foreign inclusion use simple foreign...
commit
|
commitdiff
|
tree
|
snapshot
2012-03-12
Ian Jackson
introduce and use Totally Foreign Contents
commit
|
commitdiff
|
tree
|
snapshot
2012-03-12
Ian Jackson
wip create tip
commit
|
commitdiff
|
tree
|
snapshot
2012-03-12
Ian Jackson
add missing []
commit
|
commitdiff
|
tree
|
snapshot
2012-03-12
Ian Jackson
improve proof of create base inclusion
commit
|
commitdiff
|
tree
|
snapshot
2012-03-12
Ian Jackson
create tip wip
commit
|
commitdiff
|
tree
|
snapshot
2012-03-12
Ian Jackson
introduce macros \pq \pqy \pqn
commit
|
commitdiff
|
tree
|
snapshot
2012-03-12
Ian Jackson
create base rename cond to create acyclic
commit
|
commitdiff
|
tree
|
snapshot
2012-03-12
Ian Jackson
create base fix base acyclic and condition
commit
|
commitdiff
|
tree
|
snapshot
2012-03-12
Ian Jackson
wip create tip
commit
|
commitdiff
|
tree
|
snapshot
2012-03-12
Ian Jackson
todo list item
commit
|
commitdiff
|
tree
|
snapshot
2012-03-12
Ian Jackson
use Q not B as patch name in create base
commit
|
commitdiff
|
tree
|
snapshot
2012-03-12
Ian Jackson
rename Ingredients Prohibit Replay to Prevent
commit
|
commitdiff
|
tree
|
snapshot
2012-03-12
Ian Jackson
replace various no replay with Ingredients Prohibit...
commit
|
commitdiff
|
tree
|
snapshot
2012-03-12
Ian Jackson
rename merge Ordering of L... to Ordering of Ingredients
commit
|
commitdiff
|
tree
|
snapshot
2012-03-12
Ian Jackson
create base foreign contents
commit
|
commitdiff
|
tree
|
snapshot
2012-03-12
Ian Jackson
change Not Applicable [] to Not Applicable
commit
|
commitdiff
|
tree
|
snapshot
2012-03-12
Ian Jackson
create base foreign inclusion
commit
|
commitdiff
|
tree
|
snapshot
2012-03-12
Ian Jackson
wip create base
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
create base coherence fix title
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
create base fix def
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
prove and use totally foreign contents
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
fix some headings
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
formalise foreign merges
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
Foreign Contents section in a couple of places
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
new foreign contents restriction
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
fix a section => subsection
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
fix create tip tbd
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
wip create base
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
merge conditions into conditions
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
anticommit clarify note re ingredient order
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
anticommit conditions into conditions
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
wip creates
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
formatting move/add some qeds
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
simple commit unique base clarification
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
annotation calculation
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
fix up some lemmas re ends
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
a todo item
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
anticommit foreign inclusion
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
a todo item
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
wip anticommit foreign inclusion
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
merge reference to no replay fix ref to be more regular
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
anticommit make note re merge base vs merge rhs ordering
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
anticommit - split out ordering
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
merge coherence use two implies in statement since...
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
anticommit coherence
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
anticommit rename From Base to Into Base
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
anticommit base acyclic
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
strengthen anticommit condition to From Base
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
merge foreign inclusion
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
move alternative formulation of merge results into...
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
Prove that plain git merges on non-tb branches are ok
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
Mention that simple commit justification applies to...
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
clarify text re non-tb flattened re-inclusion
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
merge wip
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
merge tip contents done
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
merge tip contentss: clarify arbitrariness of D
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
capitalise a few names
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
merge remove redundant element in condition
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
wip merge tip contents
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
some alternative formulations of \merge
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
add definition of \nequiv. \not\equiv still does not...
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
wip merge tip contents
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
wip merge tip contents
commit
|
commitdiff
|
tree
|
snapshot
2012-03-11
Ian Jackson
wip merge tip contents
commit
|
commitdiff
|
tree
|
snapshot
2012-03-08
Ian Jackson
wip merge tip contents
commit
|
commitdiff
|
tree
|
snapshot
2012-03-08
Ian Jackson
wip merge tip contents
commit
|
commitdiff
|
tree
|
snapshot
2012-03-08
Ian Jackson
merge base acyclic (and condition)
commit
|
commitdiff
|
tree
|
snapshot
2012-03-08
Ian Jackson
clarify P sets none overlap
commit
|
commitdiff
|
tree
|
snapshot
2012-03-08
Ian Jackson
wip merge tip contents
commit
|
commitdiff
|
tree
|
snapshot
2012-03-08
Ian Jackson
rename exclusive tip contents corollary
commit
|
commitdiff
|
tree
|
snapshot
2012-03-08
Ian Jackson
merge complex done
commit
|
commitdiff
|
tree
|
snapshot
2012-03-08
Ian Jackson
wip merge complex - reformulate merge ends conditions
commit
|
commitdiff
|
tree
|
snapshot
2012-03-08
Ian Jackson
merge ends condition - change condition to one that...
commit
|
commitdiff
|
tree
|
snapshot
2012-03-08
Ian Jackson
wip merge complex - final case?
commit
|
commitdiff
|
tree
|
snapshot
2012-03-08
Ian Jackson
wip merge complex - fix bug, improve merge ends condition
commit
|
commitdiff
|
tree
|
snapshot
2012-03-08
Ian Jackson
wip merge complex - a bug
commit
|
commitdiff
|
tree
|
snapshot
2012-03-08
Ian Jackson
wip merge complex
commit
|
commitdiff
|
tree
|
snapshot
2012-03-08
Ian Jackson
improve merge ends formatting
commit
|
commitdiff
|
tree
|
snapshot
2012-03-08
Ian Jackson
wip merge complex - C = D
commit
|
commitdiff
|
tree
|
snapshot
2012-03-08
Ian Jackson
wip merge complex - a fix
commit
|
commitdiff
|
tree
|
snapshot
2012-03-06
Ian Jackson
wip merge complex
commit
|
commitdiff
|
tree
|
snapshot
2012-03-06
Ian Jackson
wip merge complex
commit
|
commitdiff
|
tree
|
snapshot
2012-03-06
Ian Jackson
use \p rather than just P
commit
|
commitdiff
|
tree
|
snapshot
2012-03-06
Ian Jackson
wip merge complex
commit
|
commitdiff
|
tree
|
snapshot
2012-03-06
Ian Jackson
move merge X and Y def up
commit
|
commitdiff
|
tree
|
snapshot
2012-03-06
Ian Jackson
tiny clarification
commit
|
commitdiff
|
tree
|
snapshot
2012-03-06
Ian Jackson
introduce \proofstarts
commit
|
commitdiff
|
tree
|
snapshot
2012-03-06
Ian Jackson
wip merge content
commit
|
commitdiff
|
tree
|
snapshot
2012-03-06
Ian Jackson
add some xxx's
commit
|
commitdiff
|
tree
|
snapshot
2012-03-06
Ian Jackson
anticommit desired contents
commit
|
commitdiff
|
tree
|
snapshot
2012-03-06
Ian Jackson
Rename \merge to \mergeof so we can have \merge
commit
|
commitdiff
|
tree
|
snapshot
2012-03-06
Ian Jackson
provide \nge and \nle (which \not uses)
commit
|
commitdiff
|
tree
|
snapshot
2012-03-06
Ian Jackson
wip anticommit desired contents
commit
|
commitdiff
|
tree
|
snapshot
2012-03-05
Ian Jackson
formatting fix
commit
|
commitdiff
|
tree
|
snapshot
2012-03-05
Ian Jackson
fix title etc. in merge use of no replay
commit
|
commitdiff
|
tree
|
snapshot
next