X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=FORMAT;h=ece197637ae6ba6db920fa28aa08e0ce095a69b4;hb=c0f7fab5983a34c10790e39e7f48b546ca4011f7;hp=447a3fbd939792f63ca549d9aac6173c7ef42332;hpb=98c96c9695b93d1ed7cf2ea81d1851364faad0ba;p=topbloke.git

diff --git a/FORMAT b/FORMAT
index 447a3fb..ece1976 100644
--- a/FORMAT
+++ b/FORMAT
@@ -8,20 +8,23 @@ Topbloke branch is:
 In-tree, there are metadata files in .topbloke
 
     Files which are per-branch and do not inherit any contents
-    or changes from dependencies:
+    or changes from bases or dependencies:
 
 	msg		brach "commit message"
+			("# not applicable" in bases)
 
 	deps		direct dependencies, one per line
 			as either:
 				topbloke branch name
 				/refs/heads/<something>
+			("# not applicable" in bases)
 
 	flags		flags that apply to this branch, one per line
+			base has its own, perhaps different, set of flags;
 			 Unknown flags starting with [a-z] are ok;
 			 otherwise fatal.  Currently defined flags:
 				Deleted		branch is deleted
-
+						(valid on branch only)
 
     Files which not inherit contents and changes from dependencies: