X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=FORMAT;h=593fede09b3d1822268c4b71970189e3c9002f8c;hb=3e8d721402b8e907a2658ef86ce9c05756f85c56;hp=7313ab8b2ea228857972ce978e2f5a17d43905f4;hpb=b8de136a05e8571f21c2d03b003c8735da615a69;p=topbloke.git diff --git a/FORMAT b/FORMAT index 7313ab8..593fede 100644 --- a/FORMAT +++ b/FORMAT @@ -16,9 +16,8 @@ In-tree, there are metadata files in .topbloke deps direct dependencies, one per line as either: - .f - .tg - exist only in tip branch + - + exist only in base branch deleted exists (but empty) if branch is deleted exist only in tip branch @@ -29,7 +28,7 @@ In-tree, there are metadata files in .topbloke topgit- name of the topgit branch that this was imported from and which we should merge from (plus a newline) - exist only in tip branch + exist only in base branch [^+]*- another property that applies to this patch; if not known to this version of topbloke then it