X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke.git;a=blobdiff_plain;f=FORMAT;h=276051d5d1a046e54288956ac6f5d0dff0ed618a;hp=42f7fa445b41b9a47a06af2644fea0b61b1403a5;hb=1a6262c839e4ed26b66cbbeb68910d89be52ac03;hpb=2799df8533bddff6feeee7c1b9d31cc6583e04f9 diff --git a/FORMAT b/FORMAT index 42f7fa4..276051d 100644 --- a/FORMAT +++ b/FORMAT @@ -30,10 +30,10 @@ In-tree, there are metadata files in .topbloke deleted exists (but empty) if patch is deleted exists only in tip branch - topgit- name of the topgit branch that this was - imported from and which we should merge from - (plus a newline) - exists only in base branch +#TBD# topgit- name of the topgit branch that this was +#TBD# imported from and which we should merge from +#TBD# (plus a newline) +#TBD# exists only in base branch [^+]*- another property that applies to this patch; if not known to this version of topbloke then it