summaryrefslogtreecommitdiff
path: root/doc/git-annex.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-01-28 13:47:41 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-01-28 13:50:02 -0400
commitf351b887265f0abce8d52ffcb7b9b2ee7bd8bc81 (patch)
treec7cb719e91b82bee7f4ea8e74732dd3f3d4dc103 /doc/git-annex.mdwn
parent6a8efb186432cd9b8fa7a61f8129303f5bcc9e1f (diff)
rework Differences data type
Eliminated complexity and future proofed. The most important change is that all functions over Difference are now total; any Difference that can be expressed should be handled. Avoids needs for sanity checking of inputs, and version skew with the future. Also, the difference.log now serializes a [Difference], not a Differences. This saves space and keeps it simpler. Note that [Difference] might contain conflicting differences (eg, [Version5, Version6]. In this case, one of them needs to consistently win over the others, probably based on Ord.
Diffstat (limited to 'doc/git-annex.mdwn')
-rw-r--r--doc/git-annex.mdwn2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn
index 06eb85e11..80dce0ddc 100644
--- a/doc/git-annex.mdwn
+++ b/doc/git-annex.mdwn
@@ -1839,7 +1839,7 @@ Here are all the supported configuration settings.
Used by hook special remotes and external special remotes to record
the type of the remote.
-* `annex.tune.objecthashdirectories`, `annex.tune.objecthashlower`, `annex.tune.branchhashdirectories`
+* `annex.tune.objecthash1`, `annex.tune.objecthashlower`, `annex.tune.branchhash1`
These can be passed to `git annex init` to tune the repository.
They cannot be safely changed in a running repository.