aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Config.hs5
-rw-r--r--doc/git-annex.mdwn6
2 files changed, 11 insertions, 0 deletions
diff --git a/Config.hs b/Config.hs
index 11b5f4c93..4658531cf 100644
--- a/Config.hs
+++ b/Config.hs
@@ -116,6 +116,11 @@ getDiskReserve = fromMaybe megabyte . readSize dataUnits
where
megabyte = 1000000
+{- Gets annex.direct setting. -}
+getDirect :: Annex Bool
+getDirect = fromMaybe False . Git.Config.isTrue <$>
+ getConfig (annexConfig "direct") ""
+
{- Gets annex.httpheaders or annex.httpheaders-command setting,
- splitting it into lines. -}
getHttpHeaders :: Annex [String]
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 5a69fe496..2fbfc5b16 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -776,6 +776,12 @@ Here are all the supported configuration settings.
to close it. On Mac OSX, this defaults to 1 second, to work around
a bad interaction with software there.
+* `annex.direct`
+
+ Set to true to enable an (experimental) mode where files in the repository
+ are accessed directly, rather than through symlinks. Note that many git
+ and git-annex commands will not work with such a repository.
+
* `remote.<name>.annex-cost`
When determining which repository to