From d4bd8fdd632be43b4743f8b6a114ad48fb68bdb5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 12 Dec 2012 19:31:31 -0400 Subject: [PATCH] update --- doc/design/assistant/desymlink.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/design/assistant/desymlink.mdwn b/doc/design/assistant/desymlink.mdwn index 598f15535d..2f49c83043 100644 --- a/doc/design/assistant/desymlink.mdwn +++ b/doc/design/assistant/desymlink.mdwn @@ -82,8 +82,8 @@ is converted to a real file when it becomes present. * `git annex sync` updates the key to files mappings for files changed, but needs much other work to handle direct mode: * Generate git commit, without running `git commit`, because it will - want to stage the full files. - * Update location logs for any files deleted by a commit. + want to stage the full files. **done** + * Update location logs for any files deleted by a commit. **done** * Generate a git merge, without running `git merge` (or possibly running it in a scratch repo?), because it will stumble over the direct files. * Drop contents of files deleted by a merge (including updating the