~mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add some fast paths for standard operations.
[catacomb]
/
BRANCHES
diff --git
a/BRANCHES
b/BRANCHES
index
323b464
..
1cd9f21
100644
(file)
--- a/
BRANCHES
+++ b/
BRANCHES
@@
-1
+1,8
@@
+General conventions:
+
+For a branch FOO, we have:
+ FOO:root point at which FOO leaves trunk or parent branch
+ FOO:merge-N Nth branch merge point
+
`ec' -- elliptic curve work
`ec' -- elliptic curve work
+ ec:merge-1 Closed.