diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-12-17 13:29:10 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-12-17 13:29:10 -0400 |
| commit | caadeb495bd603a6f2b19064c4aaaec752bc3b6d (patch) | |
| tree | a9ff9380331c93c0c4c4ab4b2f78d1c8b6f0ad58 /doc/design/assistant/desymlink.mdwn | |
| parent | 63f72a295e4607061f768068e310a446bec806aa (diff) | |
| parent | 922e0d2c13d2c9105beeb18fe4eeb90dbddea76c (diff) | |
Merge branch 'master' into desymlink
Conflicts:
debian/changelog
doc/design/assistant/desymlink.mdwn
Diffstat (limited to 'doc/design/assistant/desymlink.mdwn')
| -rw-r--r-- | doc/design/assistant/desymlink.mdwn | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/design/assistant/desymlink.mdwn b/doc/design/assistant/desymlink.mdwn index 5498b3691..48d307920 100644 --- a/doc/design/assistant/desymlink.mdwn +++ b/doc/design/assistant/desymlink.mdwn @@ -62,6 +62,7 @@ is converted to a real file when it becomes present. can map to multiple files. And that when a file is deleted or moved, the mapping needs to be updated. * May need a reverse mapping, from files in the tree to keys? TBD + (Currently, getting by looking up symlinks using `git cat-file`) (Needed to make things like `git annex drop` that want to map from the file back to the key work.) * The existing watch code detects when a file gets closed, and in this |