summaryrefslogtreecommitdiff
path: root/doc/git-annex-direct.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-12-04 16:29:27 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-12-04 16:33:09 -0400
commit6e7468e9e142b379e0323d59f33c334b59c922fa (patch)
tree94f38e94c254bbc5165a6cbcf4d344d5e61a69af /doc/git-annex-direct.mdwn
parent9a765b7bd8ca28e3f94d9d7a11ce4d7162f700f1 (diff)
don't let git-annex direct be run in a v6 repo
Diffstat (limited to 'doc/git-annex-direct.mdwn')
-rw-r--r--doc/git-annex-direct.mdwn6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/git-annex-direct.mdwn b/doc/git-annex-direct.mdwn
index 457ae3116..3cade1a8c 100644
--- a/doc/git-annex-direct.mdwn
+++ b/doc/git-annex-direct.mdwn
@@ -17,12 +17,18 @@ Note that git commands that operate on the work tree will refuse to
run in direct mode repositories. Use `git annex proxy` to safely run such
commands.
+Note that the direct mode/indirect mode distinction is removed in v6
+git-annex repositories. In such a repository, you can
+use [[git-annex-unlock]](1) to make a file's content be directly present.
+
# SEE ALSO
[[git-annex]](1)
[[git-annex-indirect]](1)
+[[git-annex-unlock]](1)
+
# AUTHOR
Joey Hess <id@joeyh.name>