summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U <Richard@web>2011-03-23 09:53:16 +0000
committerGravatar admin <admin@branchable.com>2011-03-23 09:53:16 +0000
commit002db413a53ec83c93f389b09fe9926cebfaa0ec (patch)
treeae79e597ec5151825c3aae328576a97d95411db6
parent847629ee69e891185484704bd20b137c7ad06a25 (diff)
-rw-r--r--doc/bugs/softlink_atime.mdwn4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/bugs/softlink_atime.mdwn b/doc/bugs/softlink_atime.mdwn
index c62610be0..fe09ade38 100644
--- a/doc/bugs/softlink_atime.mdwn
+++ b/doc/bugs/softlink_atime.mdwn
@@ -29,7 +29,7 @@ Optionally, editing the meta-data should change the times in all annexes.
>>>>>
>>>>> So all you have to do is make the pre-commit hook call
>>>>> [metastore](http://david.hardeman.nu/software.php). The hook
->>>>> would look like this: ---[[Joey]] [[!tag done]]
+>>>>> would look like this: ---[[Joey]]
#!/bin/sh
git annex pre-commit .
@@ -47,3 +47,5 @@ Optionally, editing the meta-data should change the times in all annexes.
git add .metadata
>>>>>>> -- RichiH
+
+>>>>>>>> After getting to actually play with this from different machines with a bare git as central instance for several distributed repos, the metastore trick does not work. The .metadata is causing merge conflicts for every pull. I removed the "done" tag from this issue. -- RichiH