diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-12-12 19:31:31 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-12-12 19:31:31 -0400 |
| commit | 03fbf9e5d614e0334a3df76a7b4330bc156d3d6c (patch) | |
| tree | 66ba7b9c13ca3f06c21c960b15f3b506eb0a909f /doc/design/assistant | |
| parent | f290c2bc99c401ad0a264e165b400f4ca0ab7cb6 (diff) | |
update
Diffstat (limited to 'doc/design/assistant')
| -rw-r--r-- | doc/design/assistant/desymlink.mdwn | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/design/assistant/desymlink.mdwn b/doc/design/assistant/desymlink.mdwn index 598f15535..2f49c8304 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 |