summaryrefslogtreecommitdiff
path: root/doc/git-annex.mdwn
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/git-annex.mdwn
parent92f57da495b25b4d42ed8e2efa3fc09c89b460b0 (diff)
OSX assistant: Uses direct mode by default when setting up a new local repository.
Diffstat (limited to 'doc/git-annex.mdwn')
-rw-r--r--doc/git-annex.mdwn4
1 files changed, 2 insertions, 2 deletions
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`