summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-12-28 16:42:11 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-12-28 16:42:11 -0400
commit5c9891e1d139fb750ae5efe1ed2c8e5b2044287f (patch)
treea6c7d608f4e76059cf9ddcabfffd50c03d8a09cf /doc
parent92f57da495b25b4d42ed8e2efa3fc09c89b460b0 (diff)
OSX assistant: Uses direct mode by default when setting up a new local repository.
Diffstat (limited to 'doc')
-rw-r--r--doc/bugs/OSX_alias_permissions_and_versions_problem.mdwn4
-rw-r--r--doc/bugs/pasting_into_annex_on_OSX.mdwn5
-rw-r--r--doc/git-annex.mdwn4
3 files changed, 11 insertions, 2 deletions
diff --git a/doc/bugs/OSX_alias_permissions_and_versions_problem.mdwn b/doc/bugs/OSX_alias_permissions_and_versions_problem.mdwn
index 2c92ea3fb..f4ebc9d1e 100644
--- a/doc/bugs/OSX_alias_permissions_and_versions_problem.mdwn
+++ b/doc/bugs/OSX_alias_permissions_and_versions_problem.mdwn
@@ -31,3 +31,7 @@ The sync should be transparent but it's not, and it's error prone. It would even
Dropbox even allows to put a symlink in the dropbox directory, and it will sync the file.
[[!tag /design/assistant/OSX]]
+
+> Now the assistant creates new repositories using direct mode on OSX.
+> In direct mode, there is no locking of files; they can be modified
+> directly. [[done]] --[[Joey]]
diff --git a/doc/bugs/pasting_into_annex_on_OSX.mdwn b/doc/bugs/pasting_into_annex_on_OSX.mdwn
index 57ad9d3e0..4ea4851af 100644
--- a/doc/bugs/pasting_into_annex_on_OSX.mdwn
+++ b/doc/bugs/pasting_into_annex_on_OSX.mdwn
@@ -20,4 +20,9 @@ Please provide any additional information below.
>> Reopening since I've heard from someone else that it can still happen.
>> --[[Joey]]
+>>> Closing again, since the assistant now makes new repositories on OSX
+>>> using direct mode, which should avoid this problem. NB: any existing
+>>> repositories you have on OSX should be switched to use direct mode by
+>>> manually running `git annex direct` in them. [[done]] --[[Joey]]
+
[[!tag /design/assistant/OSX]]
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 4b4109820..169c234c1 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -788,8 +788,8 @@ Here are all the supported configuration settings.
Makes the watch and assistant commands delay for the specified number of
seconds before adding a newly created file to the annex. Normally this
is not needed, because they already wait for all writers of the file
- to close it. On Mac OSX, this defaults to 1 second, to work around
- a bad interaction with software there.
+ to close it. On Mac OSX, when not using direct mode this defaults to
+ 1 second, to work around a bad interaction with software there.
* `annex.direct`