diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-12-13 00:29:06 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-12-13 00:29:06 -0400 |
| commit | de6406afce6de0cf8a48bc2ecf9be1e7de93e40e (patch) | |
| tree | 08705fab60c11d4073734a8c2500a88b1aab7852 /doc/design/assistant/desymlink.mdwn | |
| parent | 3e55a8f164d67d5bd1ef86ae2f38fb2c6c3a51b2 (diff) | |
| parent | 94554782894ec6c26da3b46312d5d1d16d596458 (diff) | |
Merge branch 'master' into desymlink
Conflicts:
Annex/CatFile.hs
Annex/Content.hs
Git/LsFiles.hs
Git/LsTree.hs
Diffstat (limited to 'doc/design/assistant/desymlink.mdwn')
| -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 7e62d5fc9..5498b3691 100644 --- a/doc/design/assistant/desymlink.mdwn +++ b/doc/design/assistant/desymlink.mdwn @@ -89,8 +89,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 |