X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke.git;a=blobdiff_plain;f=FORMAT;h=8e061cfadbfadc50bbfd3694626ebb761388b68b;hp=75896b76ff33b90adf516734b94554f934f816cd;hb=8bbe58f296f2b26fa1457c5ed3337d66810a0fae;hpb=e0dce6d313d0ee510f00238de8abda944f8d6155 diff --git a/FORMAT b/FORMAT index 75896b7..8e061cf 100644 --- a/FORMAT +++ b/FORMAT @@ -25,15 +25,15 @@ In-tree, there are metadata files in .topbloke as either: - - exist only in base branch + exists only in base branch deleted exists (but empty) if patch is deleted - exist only in tip branch + 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) - exist only in base branch + exists only in base branch [^+]*- another property that applies to this patch; if not known to this version of topbloke then it