chiark
/
gitweb
/
~ian
/
topbloke.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
working on updates for new theory/metadata
[topbloke.git]
/
FORMAT
diff --git
a/FORMAT
b/FORMAT
index 75896b76ff33b90adf516734b94554f934f816cd..8e061cfadbfadc50bbfd3694626ebb761388b68b 100644
(file)
--- a/
FORMAT
+++ b/
FORMAT
@@
-25,15
+25,15
@@
In-tree, there are metadata files in .topbloke
as either:
<topbloke patch name>
- <ref name including refs/heads/>
as either:
<topbloke patch name>
- <ref name including refs/heads/>
- exist only in base branch
+ exist
s
only in base branch
deleted exists (but empty) if patch is deleted
deleted exists (but empty) if patch is deleted
- exist only in tip branch
+ exist
s
only in tip branch
topgit- name of the topgit branch that this was
imported from and which we should merge from
(plus a newline)
topgit- name of the topgit branch that this was
imported from and which we should merge from
(plus a newline)
- exist only in base branch
+ exist
s
only in base branch
[^+]*- another property that applies to this patch;
if not known to this version of topbloke then it
[^+]*- another property that applies to this patch;
if not known to this version of topbloke then it